# HG changeset patch
# User Garrett D'Amore <garrett@dey-sys.com>
# Date 1359572111 28800
# Node ID fd23dcf25ebba07a2c74879febb3944c19815983
# Parent  b74723e0c05f9a70e0c1dfe624bf61809944e8dd
3196 ao_gendisp use by make is racey
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>

diff -r b74723e0c05f -r fd23dcf25ebb usr/src/uts/i86xpv/Makefile
--- a/usr/src/uts/i86xpv/Makefile	Wed Jan 30 10:53:25 2013 -0800
+++ b/usr/src/uts/i86xpv/Makefile	Wed Jan 30 10:55:11 2013 -0800
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
 #	This makefile drives the production of all implementation architecture
 #	dependent modules for the i86xpv architecture.
@@ -71,7 +71,8 @@
 
 INITIAL_TARGETS = \
 	genassym \
-	unix
+	unix \
+	cpu/scripts
 
 def all clean clobber clean.lint: setup genassym unix .WAIT \
 	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
@@ -96,6 +97,7 @@
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 setup: FRC
+	@cd cpu/scripts; pwd; $(MAKE) $(TARGET)
 
 $(XMODS):	FRC
 	@if [ -f $@/Makefile  ]; then \
diff -r b74723e0c05f -r fd23dcf25ebb usr/src/uts/i86xpv/amd_opteron/Makefile
--- a/usr/src/uts/i86xpv/amd_opteron/Makefile	Wed Jan 30 10:53:25 2013 -0800
+++ b/usr/src/uts/i86xpv/amd_opteron/Makefile	Wed Jan 30 10:55:11 2013 -0800
@@ -20,6 +20,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -39,7 +41,7 @@
 
 AO_MCA_DISP_C	= $(OBJS_DIR)/ao_mca_disp.c
 AO_MCA_DISP_SRC = $(SRCDIR)/ao_mca_disp.in
-AO_GENDISP	= ../../i86pc/cpu/scripts/ao_gendisp
+AO_GENDISP	= ../cpu/scripts/ao_gendisp
 
 #
 #       Include common rules.
diff -r b74723e0c05f -r fd23dcf25ebb usr/src/uts/i86xpv/cpu/scripts/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/i86xpv/cpu/scripts/Makefile	Wed Jan 30 10:55:11 2013 -0800
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
+
+PERLFILES= \
+	ao_gendisp
+
+include ../../../Makefile.uts
+
+.KEEP_STATE:
+
+def all install setup: ao_gendisp.pl $(PERLFILES)
+
+# We are sharing the ao_gendisp source with the i86pc
+AO_GENDISP_PL=../../../i86pc/cpu/scripts/ao_gendisp.pl
+ao_gendisp.pl: $(AO_GENDISP_PL)
+	$(SYMLINK) $(AO_GENDISP_PL) $@
+
+clean clobber:
+	$(RM) ao_gendisp.pl $(PERLFILES)
+
+include ../../../Makefile.targ