m

6 files changed, 13 insertions, 6 deletions

diff --git a/usr/src/Makefile b/usr/src/Makefile
index ef6381a828..ce8962609a 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -60,7 +60,7 @@ CHKHDRSUBDIRS=	head uts lib
 #
 # Headers that can be built in parallel
 #
-PARALLEL_HEADERS = userheaders libheaders ucbheaders cmdheaders
+PARALLEL_HEADERS = sysheaders userheaders libheaders ucbheaders cmdheaders
 
 #
 # Directories that can be built in parallel
@@ -212,7 +212,7 @@ $(ROOTDIRS) $(MSGDIRS):
 userheaders: FRC
 	@cd head; pwd; $(MAKE) install_h
 
-libheaders: bldtools sysheaders
+libheaders: bldtools
 	@cd lib; pwd; $(MAKE) install_h
 
 sysheaders: FRC
diff --git a/usr/src/lib/libc/Makefile.targ b/usr/src/lib/libc/Makefile.targ
index a61e3f3e41..8721e8ec21 100644
--- a/usr/src/lib/libc/Makefile.targ
+++ b/usr/src/lib/libc/Makefile.targ
@@ -320,8 +320,6 @@ pics/%.o: $(LIBCBASE)/../port/threads/%.d $(THREADSOBJS:%=pics/%)
 
 # assym rules
 
-GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
-
 #
 # genassym is a funny fish: it's run on the build machine, so should use the
 # native compilers, but its job is to reflect the proto area header definitions,
@@ -331,10 +329,11 @@ GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 genassym: $(GENASSYM_C)
 	$(NATIVECC) $(NATIVE_CFLAGS) $(CPPFLAGS) -o $@ $(GENASSYM_C)
 
+# shared between 32- and 64-bit
 OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
 
-assym.h: $(OFFSETS) $(LIBCDIR)/$(MACH)/genassym
+assym.h: $(OFFSETS) genassym
 	$(OFFSETS_CREATE) <$(OFFSETS) >$@
-	$(LIBCDIR)/$(MACH)/genassym >>$@
+	./genassym >>$@
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index e239bc5fec..d3aa4511af 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1247,6 +1247,8 @@ $(LIB_PIC): pics $$(PICS)
 	$(AR) -ts $@ > /dev/null
 	$(POST_PROCESS_A)
 
+GENASSYM_C = $(LIBCDIR)/$(MACH64)/genassym.c
+
 ASSYMDEP_OBJS=			\
 	_lwp_mutex_unlock.o	\
 	_stack_grow.o		\
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 3d2c883fa1..c0cd48147b 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1335,6 +1335,8 @@ ASSYMDEP_OBJS=			\
 	tls_get_addr.o		\
 	vforkx.o
 
+GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
+
 $(ASSYMDEP_OBJS:%=pics/%)	:=	CPPFLAGS += -I.
 
 $(ASSYMDEP_OBJS:%=pics/%): assym.h
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index 14fe9c26a6..4e09e44571 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -1411,6 +1411,8 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h
 
 assym.h := CFLAGS += -g
 
+GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
+
 # derived C source and related explicit dependencies
 $(LIBCDIR)/port/gen/errlst.c + \
 $(LIBCDIR)/port/gen/new_list.c: $(LIBCDIR)/port/gen/errlist $(LIBCDIR)/port/gen/errlist.awk
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index 113a9d1ba9..240ecef7db 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -1325,6 +1325,8 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h
 
 assym.h := CFLAGS64 += -g
 
+GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
+
 # derived C source and related explicit dependencies
 $(LIBCDIR)/port/gen/new_list.c: $(LIBCDIR)/port/gen/errlist $(LIBCDIR)/port/gen/errlist.awk
 	cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist