diff options
Diffstat (limited to 'usr/src/lib')
45 files changed, 60 insertions, 76 deletions
diff --git a/usr/src/lib/Makefile.filter.targ b/usr/src/lib/Makefile.filter.targ index 76e23fcb62..a9fe870a76 100644 --- a/usr/src/lib/Makefile.filter.targ +++ b/usr/src/lib/Makefile.filter.targ @@ -28,7 +28,7 @@ # Override shared object build rule from Makefile.lib. This rule uses $(LD) # directly to avoid .init and .fini sections being added. -BUILD.SO = $(LD) $(MAPFILECLASS) -o $@ -G $(DYNFLAGS) +BUILD.SO = $(LD) $(MAPFILECLASS) -o $@ $(GSHARED) $(DYNFLAGS) # Since no OBJECTS are used in this build, turn off CTF. diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index b87923b006..fb16de1a17 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -126,7 +126,7 @@ SONAME= $(DYNLIB) # All options are tunable to allow overload/omission from lower makefiles. HSONAME= -h$(SONAME) DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ - $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ + $(MAPFILES:%=-Wl,-M%) $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) \ $(LDCHECKS) LDLIBS= $(LDLIBS.lib) @@ -206,7 +206,7 @@ HSONAMECCC= -h $(SONAMECCC) # Keep in sync with the standard DYNFLAGS # $(DYNLIBCCC):= DYNFLAGS = $(HSONAMECCC) $(ZTEXT) $(ZDEFS) \ - $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ + $(MAPFILES:%=-Wl,-M%) $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) \ $(BDIRECT) $(NORUNPATH) diff --git a/usr/src/lib/abi/apptrace/Makefile.com b/usr/src/lib/abi/apptrace/Makefile.com index 8fe6427f34..e209d9a730 100644 --- a/usr/src/lib/abi/apptrace/Makefile.com +++ b/usr/src/lib/abi/apptrace/Makefile.com @@ -42,7 +42,7 @@ MAPFILES = # to run amd64 64-bit executables: ZDEFS = $(SUPPRESS_LIBS)LDLIBS += -lmapmalloc -lproc -lctf -lc -$(SUPPRESS_LIBS)ZDEFS = -zdefs +$(SUPPRESS_LIBS)ZDEFS = -Wl,-zdefs all: $(LIBS) diff --git a/usr/src/lib/brand/shared/librtld_db/Makefile.com b/usr/src/lib/brand/shared/librtld_db/Makefile.com index ec5d706d43..1a1e65f392 100644 --- a/usr/src/lib/brand/shared/librtld_db/Makefile.com +++ b/usr/src/lib/brand/shared/librtld_db/Makefile.com @@ -44,7 +44,7 @@ UTSBASE = $(SRC)/uts # brand plugin library can use to access a target process are the # proc_service(3PROC) apis. # -DYNFLAGS += $(VERSREF) -M$(BRAND_SHARED)/librtld_db/common/mapfile-vers +DYNFLAGS += $(VERSREF) -Wl,-M$(BRAND_SHARED)/librtld_db/common/mapfile-vers LIBS = $(DYNLIB) LDLIBS += -lc -lrtld_db CFLAGS += $(CCVERBOSE) diff --git a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com index 38435fc044..83c501ca3d 100644 --- a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com +++ b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com @@ -70,7 +70,7 @@ DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start #DYNFLAGS += -R$(NATIVE_DIR)/lib -R$(NATIVE_DIR)/usr/lib LDLIBS += -lmapmalloc -lc -ZGUIDANCE = -zguidance=nounused +ZGUIDANCE = -Wl,-zguidance=nounused $(LIBS):= PICS += $(SHAREDOBJS) .KEEP_STATE: diff --git a/usr/src/lib/c_synonyms/Makefile.com b/usr/src/lib/c_synonyms/Makefile.com index ece376e15d..bf6d25c14d 100644 --- a/usr/src/lib/c_synonyms/Makefile.com +++ b/usr/src/lib/c_synonyms/Makefile.com @@ -30,10 +30,10 @@ OBJECTS = synonyms.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) -LDLIBS += -lc +LIBS = $(DYNLIB) +LDLIBS += -lc -BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) CLEANFILES += synonym_list mapfile-vers diff --git a/usr/src/lib/c_synonyms/amd64/Makefile b/usr/src/lib/c_synonyms/amd64/Makefile index f7402f33aa..751a5fab30 100644 --- a/usr/src/lib/c_synonyms/amd64/Makefile +++ b/usr/src/lib/c_synonyms/amd64/Makefile @@ -28,6 +28,6 @@ ASFLAGS= $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(amd64_AS_XARCH) include ../Makefile.com include ../../Makefile.lib.64 -BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) -64 $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBS64) diff --git a/usr/src/lib/c_synonyms/sparcv9/Makefile b/usr/src/lib/c_synonyms/sparcv9/Makefile index 0f5cceeeb9..8ce15fe649 100644 --- a/usr/src/lib/c_synonyms/sparcv9/Makefile +++ b/usr/src/lib/c_synonyms/sparcv9/Makefile @@ -28,6 +28,6 @@ ASFLAGS= $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(sparcv9_AS_XARCH) include ../Makefile.com include ../../Makefile.lib.64 -BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) -64 $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBS64) diff --git a/usr/src/lib/efcode/extend/sparcv9/Makefile b/usr/src/lib/efcode/extend/sparcv9/Makefile index 4c18f69631..aac5b13724 100644 --- a/usr/src/lib/efcode/extend/sparcv9/Makefile +++ b/usr/src/lib/efcode/extend/sparcv9/Makefile @@ -22,12 +22,10 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -DYNFLAGS += $(FCODE64) -Mmapfile-extern +DYNFLAGS += $(FCODE64) -Wl,-Mmapfile-extern install: all $(ROOTLIBS64) diff --git a/usr/src/lib/efcode/interpreter/Makefile b/usr/src/lib/efcode/interpreter/Makefile index b8ee762d46..d0099ae275 100644 --- a/usr/src/lib/efcode/interpreter/Makefile +++ b/usr/src/lib/efcode/interpreter/Makefile @@ -36,7 +36,7 @@ CPPFLAGS += -DDEBUG -DFCODE_INTERNAL CPPFLAGS += -I ../include -I $(ROOT)/usr/platform/sun4u/include CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += $(CNOWARN_UNINIT) -LDFLAGS += -R/usr/lib/efcode/$(MACH64) -M mapfile64 +LDFLAGS += -R/usr/lib/efcode/$(MACH64) -Wl,-Mmapfile64 LIBS = fcode.so fcdriver.so $(PROG) := LDLIBS += -L$(ADJUNCT_PROTO)/usr/lib/efcode/$(MACH64) \ diff --git a/usr/src/lib/efcode/packages/sparcv9/Makefile b/usr/src/lib/efcode/packages/sparcv9/Makefile index 9147403a9e..f0c459a15b 100644 --- a/usr/src/lib/efcode/packages/sparcv9/Makefile +++ b/usr/src/lib/efcode/packages/sparcv9/Makefile @@ -22,12 +22,10 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -DYNFLAGS += $(FCODE64) -M$(MAPFILE-EXT) +DYNFLAGS += $(FCODE64) -Wl,-M$(MAPFILE-EXT) install: all $(ROOTLIBS64) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index a1827911a5..c42c02da80 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -63,11 +63,11 @@ MAPFILES = # use APIMAP instead CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -I. CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -LDFLAGS += $(ZIGNORE) -M$(APIMAP) +LDFLAGS += $(ZIGNORE) -Wl,-M$(APIMAP) LDLIBS += -L$(ROOTLIBDIR)/fm -ltopo -lnvpair -lc DYNFLAGS += -R/usr/lib/fm diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com index 5c09e472fc..8664e5a0df 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com @@ -316,7 +316,7 @@ LDLIBS += -lgss -lsocket -lresolv -lc -lpkcs11 -lnsl -lkstat DYNFLAGS += $(ZIGNORE) # mech lib needs special initialization at load time -DYNFLAGS += -zinitarray=krb5_ld_init +DYNFLAGS += -Wl,-zinitarray=krb5_ld_init objs/%.o pics/%.o: $(SRC)/uts/common/gssapi/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/iconv_modules/Makefile.iconv b/usr/src/lib/iconv_modules/Makefile.iconv index 3b48123f64..b9efb3ea15 100644 --- a/usr/src/lib/iconv_modules/Makefile.iconv +++ b/usr/src/lib/iconv_modules/Makefile.iconv @@ -47,7 +47,7 @@ CPPFLAGS += -I../../inc -I. -I../../common CFLAGS += $(C_PICFLAGS) $(GSHARED) DYNFLAGS= $(GSHARED) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ - $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(MAPFILES:%=-Wl,-M%) $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) LDLIBS= -lc diff --git a/usr/src/lib/iconv_modules/euro/utils/Makefile.com b/usr/src/lib/iconv_modules/euro/utils/Makefile.com index 3e403492f3..be4327787d 100644 --- a/usr/src/lib/iconv_modules/euro/utils/Makefile.com +++ b/usr/src/lib/iconv_modules/euro/utils/Makefile.com @@ -26,7 +26,7 @@ include $(SRC)/Makefile.master include $(SRC)/lib/iconv_modules/Makefile.iconv -CFLAGS = -Xa -fPIC -G -xO3 -I. $(XREGSFLAG) -D_REENTRANT +CFLAGS = $(CCMODE) $(C_BIGPICFLAGS) $(GSHARED) $(COPTFLAG) -I. $(XREGSFLAG) -D_REENTRANT SRCS = 646%8859.c 646da%8859.c 646de%8859.c 646en%8859.c 646es%8859.c 646fr%8859.c 646it%8859.c 646sv%8859.c \ 8859%646.c 8859%646da.c 8859%646de.c 8859%646en.c 8859%646es.c 8859%646fr.c 8859%646it.c 8859%646sv.c 8859-1%IBM-037.c \ diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index 1975547329..73f90c4777 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -72,7 +72,7 @@ CERRWARN += -_gcc=-Wno-unused-function SMATCH=off CFLAGS += $(CCVERBOSE) -I.. -DYNFLAGS += $(KRUNPATH) $(KMECHLIB) -znodelete +DYNFLAGS += $(KRUNPATH) $(KMECHLIB) $(ZNODELETE) LDLIBS += -L $(ROOTLIBDIR) -lcrypto -lc NATIVE_LIBS += libcrypto.so diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 2c428afacb..2d350372d6 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1061,7 +1061,7 @@ CFLAGS64 += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) MAPFILES = $(LIBCDIR)/port/mapfile-vers diff --git a/usr/src/lib/libc/capabilities/Makefile.com b/usr/src/lib/libc/capabilities/Makefile.com index f8e9e46331..34f57102b6 100644 --- a/usr/src/lib/libc/capabilities/Makefile.com +++ b/usr/src/lib/libc/capabilities/Makefile.com @@ -26,7 +26,7 @@ include $(SRC)/lib/Makefile.lib MAPFILE-CAP = ../common/mapfile-cap -MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) +MAPOPT-CAP = $(MAPFILE-CAP:%=-Wl,-M%) OBJCAP = pics/objcap.o SYMCAP = pics/symcap.o diff --git a/usr/src/lib/libc/capabilities/Makefile.targ b/usr/src/lib/libc/capabilities/Makefile.targ index d9f7891f22..1691d37898 100644 --- a/usr/src/lib/libc/capabilities/Makefile.targ +++ b/usr/src/lib/libc/capabilities/Makefile.targ @@ -43,7 +43,7 @@ pics/%.o: ../../$(ALT_PLATFORM)/common/%.s # to this object, and define the interface. pics/objcap.o: $(PICS) $(MAPFILE-CAP) - $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + $(LD) -r -o $@ $(MAPOPT-CAP) $(BREDUCE) $(PICS) $(POST_PROCESS_OBJCAP_O) # Convert the combined object capabilities object into a symbol capabilities diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 35f96feda3..d3e2c51360 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1110,7 +1110,7 @@ CFLAGS += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \ +$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) \ $(EXTPICS) $(LDLIBS) MAPFILES = $(LIBCDIR)/port/mapfile-vers diff --git a/usr/src/lib/libc/i386_hwcap1/Makefile b/usr/src/lib/libc/i386_hwcap1/Makefile index 42fa4d5cae..a9ce500424 100644 --- a/usr/src/lib/libc/i386_hwcap1/Makefile +++ b/usr/src/lib/libc/i386_hwcap1/Makefile @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libc/i386_hwcap1/Makefile -# LIBCBASE= ../i386 @@ -34,7 +30,7 @@ LIBRARY= libc_hwcap1.a EXTN_CPPFLAGS= -D_CMOV_INSN -D_SSE_INSN -D_MMX_INSN -D_SEP_INSN EXTN_CFLAGS= -xtarget=pentium_pro -EXTN_DYNFLAGS= -M mapfile +EXTN_DYNFLAGS= -Wl,-Mmapfile # Defining this means build targets will first try to use source from this # directory before falling back to unoptimized i386 source. diff --git a/usr/src/lib/libc/i386_hwcap3/Makefile b/usr/src/lib/libc/i386_hwcap3/Makefile index 39725b9b5b..a3d925770c 100644 --- a/usr/src/lib/libc/i386_hwcap3/Makefile +++ b/usr/src/lib/libc/i386_hwcap3/Makefile @@ -22,10 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libc/i386_hwcap3/Makefile -# LIBCBASE= ../i386 @@ -33,7 +29,7 @@ LIBRARY= libc_hwcap3.a EXTN_CPPFLAGS= -D_CMOV_INSN -D_SSE_INSN -D_MMX_INSN EXTN_CFLAGS= -xtarget=pentium_pro -EXTN_DYNFLAGS= -M mapfile +EXTN_DYNFLAGS= -Wl,-Mmapfile # Defining this means build targets will first try to use source from this # directory before falling back to unoptimized i386 source. diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index abd0d25056..8ecec57516 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1134,7 +1134,7 @@ CFLAGS += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) MAPFILES = $(LIBCDIR)/port/mapfile-vers diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index f5bfaf5c9d..7036b2e20d 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -1075,7 +1075,7 @@ CFLAGS64 += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) MAPFILES = $(LIBCDIR)/port/mapfile-vers diff --git a/usr/src/lib/libc_db/amd64/Makefile b/usr/src/lib/libc_db/amd64/Makefile index 99231f7c40..ed93694a91 100644 --- a/usr/src/lib/libc_db/amd64/Makefile +++ b/usr/src/lib/libc_db/amd64/Makefile @@ -31,7 +31,7 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc_db/i386/Makefile b/usr/src/lib/libc_db/i386/Makefile index 5e1faf8ef7..d84f565225 100644 --- a/usr/src/lib/libc_db/i386/Makefile +++ b/usr/src/lib/libc_db/i386/Makefile @@ -28,7 +28,7 @@ CRTSRCS= ../../crt/i386 include ../Makefile.com -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparc/Makefile b/usr/src/lib/libc_db/sparc/Makefile index 64b7326c93..269ca8c56e 100644 --- a/usr/src/lib/libc_db/sparc/Makefile +++ b/usr/src/lib/libc_db/sparc/Makefile @@ -28,7 +28,7 @@ CRTSRCS= ../../crt/sparc include ../Makefile.com -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparcv9/Makefile b/usr/src/lib/libc_db/sparcv9/Makefile index 6e0e5d6357..f98dd8443f 100644 --- a/usr/src/lib/libc_db/sparcv9/Makefile +++ b/usr/src/lib/libc_db/sparcv9/Makefile @@ -31,7 +31,7 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com index c896f6f7f8..1016c8e295 100644 --- a/usr/src/lib/libdtrace/Makefile.com +++ b/usr/src/lib/libdtrace/Makefile.com @@ -225,12 +225,12 @@ pics/%.o: ../$(MACH)/%.s $(POST_PROCESS_O) $(DRTIOBJ): $(DRTIOBJS) - $(LD) -o $@ -r -Blocal -Breduce $(DRTIOBJS) + $(LD) -o $@ -r $(BLOCAL) $(BREDUCE) $(DRTIOBJS) $(POST_PROCESS_O) $(LIBDAUDIT): $(LIBDAUDITOBJS) $(LINK.c) -o $@ $(GSHARED) -h$(LIBDAUDIT) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ - $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) $(LIBDAUDITOBJS) \ + $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(LIBDAUDITOBJS) \ $(LIBDAUDITLIBS) $(POST_PROCESS_SO) diff --git a/usr/src/lib/libfru/i386/Makefile b/usr/src/lib/libfru/i386/Makefile index e04d11b309..1c56c402d9 100644 --- a/usr/src/lib/libfru/i386/Makefile +++ b/usr/src/lib/libfru/i386/Makefile @@ -30,7 +30,7 @@ LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH) -lfruutils LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH) -lfrureg # Redefine this such that libC is found. -BUILDCCC.SO= $(LINK.cc) $(DYNFLAGS) -o $@ -G $(PICS) $(LDLIBS) +BUILDCCC.SO= $(LINK.cc) $(DYNFLAGS) -o $@ $(GSHARED) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR) $(ROOTLINKSCCC) diff --git a/usr/src/lib/libfru/sparc/Makefile b/usr/src/lib/libfru/sparc/Makefile index 72c01007d7..de9c2c42cf 100644 --- a/usr/src/lib/libfru/sparc/Makefile +++ b/usr/src/lib/libfru/sparc/Makefile @@ -23,10 +23,6 @@ # Copyright (c) 2000-2001 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libfru/sparc/Makefile -# include ../Makefile.obj include ../Makefile.flag @@ -34,7 +30,7 @@ LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH) -lfruutils LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH) -lfrureg # Redefine this such that libC is found. -BUILDCCC.SO= $(LINK.cc) $(DYNFLAGS) -o $@ -G $(PICS) $(LDLIBS) +BUILDCCC.SO= $(LINK.cc) $(DYNFLAGS) -o $@ $(GSHARED) $(PICS) $(LDLIBS) install: all $(ROOTLIBDIR) $(ROOTLINKSCCC) diff --git a/usr/src/lib/libm1/Makefile.com b/usr/src/lib/libm1/Makefile.com index 5672bea95b..6ba8e1d6c5 100644 --- a/usr/src/lib/libm1/Makefile.com +++ b/usr/src/lib/libm1/Makefile.com @@ -31,7 +31,7 @@ SRCDIR = ../common/ CPPFLAGS += -DLIBM_BUILD MAPFILEDIR = ../common/ -DYNFLAGS += -zignore -Wl,-F'libm.so.2' +DYNFLAGS += $(ZIGNORE) -Wl,-F'libm.so.2' COMPATLINKS = usr/lib/$(DYNLIB) COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile index aab8d061a9..853ec22b8a 100644 --- a/usr/src/lib/libmd/amd64/Makefile +++ b/usr/src/lib/libmd/amd64/Makefile @@ -74,7 +74,7 @@ pics/%.o: $(SRC)/common/crypto/sha2/amd64/%.s $(POST_PROCESS_O) pics/%.o.objcap: pics/%.o - $(LD) -r -o $@ -M$(CAPFILE) -Breduce $< + $(LD) -r -o $@ -Wl,-M$(CAPFILE) $(BREDUCE) $< $(POST_PROCESS_O) pics/%.o.symcap: pics/%.o.objcap diff --git a/usr/src/lib/libmd/capabilities/Makefile.com b/usr/src/lib/libmd/capabilities/Makefile.com index 7c550fb533..6b3973b9ba 100644 --- a/usr/src/lib/libmd/capabilities/Makefile.com +++ b/usr/src/lib/libmd/capabilities/Makefile.com @@ -26,7 +26,7 @@ #include ../../../Makefile.com MAPFILE-CAP = ../common/mapfile-cap -MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) +MAPOPT-CAP = $(MAPFILE-CAP:%=-Wl,-M%) OBJCAP = pics/objcap.o SYMCAP = pics/symcap.o diff --git a/usr/src/lib/libmd/capabilities/Makefile.targ b/usr/src/lib/libmd/capabilities/Makefile.targ index 86815a1987..8af0f75328 100644 --- a/usr/src/lib/libmd/capabilities/Makefile.targ +++ b/usr/src/lib/libmd/capabilities/Makefile.targ @@ -60,7 +60,7 @@ $(PICS): pics # to this object, and define the interface. pics/objcap.o: $(PICS) $(MAPFILE-CAP) - $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + $(LD) -r -o $@ $(MAPOPT-CAP) $(BREDUCE) $(PICS) # Convert the combined object capabilities object into a symbol capabilities # object. diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile index c51c018c88..172ce9cf3a 100644 --- a/usr/src/lib/libmp/i386/Makefile +++ b/usr/src/lib/libmp/i386/Makefile @@ -41,8 +41,8 @@ $(ROOTLIBDIR)/$(OLIBRARY) := FILEMODE= 755 $(OLIBRARY): pics/pics_mp.o libmp.so.2 $(OMAPFILE) $(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZTEXT) $(ZDEFS) \ - $(BDIRECT) pics/pics_mp.o libmp.so.2 -M$(OMAPFILE) \ - $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(BDIRECT) pics/pics_mp.o libmp.so.2 -Wl,-M$(OMAPFILE) \ + $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(POST_PROCESS_SO) pics/pics_mp.o: diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile index 8bb9a77528..7f903f338d 100644 --- a/usr/src/lib/libmp/sparc/Makefile +++ b/usr/src/lib/libmp/sparc/Makefile @@ -41,8 +41,8 @@ $(ROOTLIBDIR)/$(OLIBRARY) := FILEMODE= 755 $(OLIBRARY): pics/pics_mp.o libmp.so.2 $(OMAPFILE) $(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZTEXT) $(ZDEFS) \ - $(BDIRECT) $(ZCOMBRELOC) pics/pics_mp.o libmp.so.2 -M$(OMAPFILE) \ - $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(BDIRECT) $(ZCOMBRELOC) pics/pics_mp.o libmp.so.2 -Wl,-M$(OMAPFILE) \ + $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(POST_PROCESS_SO) pics/pics_mp.o: diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com index 21ddb07c76..876940f995 100644 --- a/usr/src/lib/libumem/Makefile.com +++ b/usr/src/lib/libumem/Makefile.com @@ -120,8 +120,8 @@ MAPFILE_SUPPLEMENTAL = $(MAPFILE_SUPPLEMENTAL_$(CURTYPE)) LDLIBS += -lc -LDFLAGS_standalone = $(ZNOVERSION) $(BREDUCE) -M../common/mapfile-vers \ - -M$(MAPFILE_SUPPLEMENTAL) -dy -r +LDFLAGS_standalone = $(ZNOVERSION) $(BREDUCE) -Wl,-M../common/mapfile-vers \ + -Wl,-M$(MAPFILE_SUPPLEMENTAL) -dy -r LDFLAGS = $(LDFLAGS_$(CURTYPE)) ASFLAGS_standalone = -DUMEM_STANDALONE diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com index eefe784d72..f45bf28652 100644 --- a/usr/src/lib/mpapi/libmpapi/Makefile.com +++ b/usr/src/lib/mpapi/libmpapi/Makefile.com @@ -40,8 +40,8 @@ LDLIBS += -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -mt $(CCVERBOSE) -D_POSIX_PTHREAD_SEMANTICS CPPFLAGS += -DBUILD_TIME='"Wed Sep 24 12:00:00 2008"' -DYNFLAGS += -z finiarray=ExitLibrary -DYNFLAGS += -z initarray=InitLibrary +DYNFLAGS += -Wl,-zfiniarray=ExitLibrary +DYNFLAGS += -Wl,-zinitarray=InitLibrary CERRWARN += -_gcc=-Wno-type-limits CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com index 7548b023c3..595ffe2148 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com @@ -26,7 +26,7 @@ include ../../../Makefile.com MAPFILE-CAP = ../common/mapfile-cap -MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) +MAPOPT-CAP = $(MAPFILE-CAP:%=-Wl,-M%) OBJCAP = pics/objcap.o SYMCAP = pics/symcap.o diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ index dfd9b10aea..c6f94118c3 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ @@ -60,7 +60,7 @@ $(PICS): pics # to this object, and define the interface. pics/objcap.o: $(PICS) $(MAPFILE-CAP) - $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + $(LD) -r -o $@ $(MAPOPT-CAP) $(BREDUCE) $(PICS) # Convert the combined object capabilities object into a symbol capabilities # object. diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com index 3de91a340b..dfb4c926ce 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile.com +++ b/usr/src/lib/print/libpapi-lpd/Makefile.com @@ -79,7 +79,7 @@ OBJS += $(PROG_OBJS) LDFLAGS.cmd = \ $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) $(BDIRECT) \ - $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(MAPFILE.NES:%=-Wl,-M%) $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(PROG): $(PROG_OBJS) $(LINK.c) -o $@ $(PROG_OBJS) $(LDFLAGS.cmd) $(LDLIBS) diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine index 0bad757481..6467bcdbe9 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine @@ -55,15 +55,15 @@ APIMAP = ../../../../../libscsi/libscsi_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT CPPFLAGS += -I../../../../../libscsi/common $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG LDFLAGS += $(ZTEXT) $(ZIGNORE) -$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP) +$(PROG) := LDFLAGS += $(ZDEFS) -Wl,-M$(APIMAP) $(PROG) := LDLIBS += -lc $(DMODPROG) := LDFLAGS += $(ZNODEFS) diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib index 4d9d106f2e..ec23911852 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.lib +++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib @@ -65,14 +65,14 @@ APIMAP = ../../../../libses/libses_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG LDFLAGS += $(ZTEXT) $(ZIGNORE) -$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP) +$(PROG) := LDFLAGS += $(ZDEFS) -Wl,-M$(APIMAP) $(PROG) := LDLIBS += -lc -lnvpair $(DMODPROG) := LDFLAGS += $(ZNODEFS) diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.lib b/usr/src/lib/scsi/plugins/smp/Makefile.lib index 0474284472..ba955f7b10 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.lib +++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib @@ -64,14 +64,14 @@ APIMAP = ../../../../libsmp/libsmp_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE) -$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP) +$(PROG) := LDFLAGS += $(ZDEFS) -Wl,-M$(APIMAP) $(PROG) := LDLIBS += -lc $(DMODPROG) := LDFLAGS += $(ZNODEFS) |