Description: Fixes for GNU make. These fixes make GNU make produce correct results. Some of issues should be fixed in Makefiles, others may need support from GNU make, for example: http://savannah.gnu.org/bugs/?37237 Index: b/usr/src/lib/libc/Makefile.targ =================================================================== --- a/usr/src/lib/libc/Makefile.targ +++ b/usr/src/lib/libc/Makefile.targ @@ -53,10 +53,6 @@ pics/%.o: $(LIBCBASE)/../$(TARGET_ARCH)/ $(BUILD.s) $(POST_PROCESS_O) -pics/_stack_grow.o: $(LIBCBASE)/../$(TARGET_ARCH)/gen/_stack_grow.s - $(BUILD.s) $(LIBCBASE)/../$(TARGET_ARCH)/gen/_stack_grow.s - $(POST_PROCESS_O) - pics/%.o: $(LIBCBASE)/fp/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -276,23 +272,23 @@ pics/%.o: $(SRC)/common/atomic/$(TARGETM $(BUILD.s) $(POST_PROCESS_O) -$(COMOBJS:%=pics/%): $(SRC)/common/util/$$(@F:.o=.c) +$(COMOBJS:%=pics/%): $(SRC)/common/util/$$(patsubst %.o,%.c,$$(@F)) $(COMPILE.c) -o $@ $(SRC)/common/util/$(@F:.o=.c) $(POST_PROCESS_O) -$(XATTROBJS:%=pics/%): $(SRC)/common/xattr/$$(@F:.o=.c) +$(XATTROBJS:%=pics/%): $(SRC)/common/xattr/$$(patsubst %.o,%.c,$$(@F)) $(COMPILE.c) -o $@ $(SRC)/common/xattr/$(@F:.o=.c) $(POST_PROCESS_O) -$(DTRACEOBJS:%=pics/%): $(SRC)/common/dtrace/$$(@F:.o=.c) +$(DTRACEOBJS:%=pics/%): $(SRC)/common/dtrace/$$(patsubst %.o,%.c,$$(@F)) $(COMPILE.c) -o $@ $(SRC)/common/dtrace/$(@F:.o=.c) $(POST_PROCESS_O) -$(UNICODEOBJS:%=pics/%): $(SRC)/common/unicode/$$(@F:.o=.c) +$(UNICODEOBJS:%=pics/%): $(SRC)/common/unicode/$$(patsubst %.o,%.c,$$(@F)) $(COMPILE.c) -o $@ $(SRC)/common/unicode/$(@F:.o=.c) $(POST_PROCESS_O) -$(CHACHAOBJS:%=pics/%): $(SRC)/common/crypto/chacha/$$(@F:.o=.c) +$(CHACHAOBJS:%=pics/%): $(SRC)/common/crypto/chacha/$$(patsubst %.o,%.c,$$(@F)) $(COMPILE.c) -I$(SRC)/common/crypto/chacha -DKEYSTREAM_ONLY \ -o $@ $(SRC)/common/crypto/chacha/$(@F:.o=.c) $(POST_PROCESS_O) Index: b/usr/src/Makefile.msg.targ =================================================================== --- a/usr/src/Makefile.msg.targ +++ b/usr/src/Makefile.msg.targ @@ -33,7 +33,7 @@ .PARALLEL: $(POFILES) $(MSGFILES) -$(MSGDOMAIN)% $(DCMSGDOMAIN)%: +$(MSGDOMAIN) $(DCMSGDOMAIN): $(INS.dir) $(MSGDOMAINPOFILE): $(MSGDOMAIN) $(POFILE) Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1314,5 +1314,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1240,5 +1240,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O)