summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/Makefile.master5
-rw-r--r--usr/src/cmd/sgs/Makefile.var3
-rw-r--r--usr/src/cmd/sgs/ldprof/Makefile.com8
-rw-r--r--usr/src/cmd/sgs/libcrle/Makefile.com6
-rw-r--r--usr/src/cmd/sgs/libelf/Makefile.com7
-rw-r--r--usr/src/cmd/sgs/link_audit/Makefile.com14
-rw-r--r--usr/src/cmd/sgs/packages/common/SUNWonld-README9
-rw-r--r--usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com4
-rw-r--r--usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com4
-rw-r--r--usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com4
-rw-r--r--usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com4
-rw-r--r--usr/src/lib/gss_mechs/mech_krb5/Makefile.com8
-rw-r--r--usr/src/lib/krb5/ss/Makefile.com4
-rw-r--r--usr/src/lib/rpcsec_gss/Makefile.com8
14 files changed, 48 insertions, 40 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index c27fa24bda..9f2faf1841 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -20,7 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -355,7 +355,7 @@ STAND_FLAGS_64 = $($(MACH64)_STAND_FLAGS)
ILDOFF= -xildoff
#
XDEPEND= -xdepend
-XFFLAG= -xF
+XFFLAG= -xF=%all
XESS= -xs
XSTRCONST= -xstrconst
@@ -762,6 +762,7 @@ ZNODUMP= -znodump
ZNOLAZYLOAD= -znolazyload
ZNORELOC= -znoreloc
ZNOVERSION= -znoversion
+ZRECORD= -zrecord
ZREDLOCSYM= -zredlocsym
ZTEXT= -ztext
ZVERBOSE= -zverbose
diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var
index 8d710d4eda..85e3dffdc6 100644
--- a/usr/src/cmd/sgs/Makefile.var
+++ b/usr/src/cmd/sgs/Makefile.var
@@ -20,7 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -109,7 +109,6 @@
# Common Macro definitions
#
VAR_CPPFLAGS=
-VAR_XFFLAG= -xF=%all
VAR_LINTFLAGS64= -Xarch=$(MACH64:sparcv9=v9)
VAR_I386_ARCH= intel
diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com
index d14c2e9d39..7738e62dde 100644
--- a/usr/src/cmd/sgs/ldprof/Makefile.com
+++ b/usr/src/cmd/sgs/ldprof/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -34,8 +34,6 @@ OBJECTS= $(COMOBJS) $(BLTOBJ)
include ../../../../lib/Makefile.lib
include ../../Makefile.com
-ZIGNORE=
-
ROOTLIBDIR= $(ROOT)/usr/lib/link_audit
SGSPROTO= ../../proto/$(MACH)
@@ -59,7 +57,9 @@ CPPFLAGS= -I. -I../common -I../../include \
-I$(SRCBASE)/uts/$(ARCH)/sys \
$(CPPFLAGS.master)
CFLAGS += $(C_PICFLAGS)
-LDLIBS += -lmapmalloc -lc $(DLLIB)
+
+lint := ZRECORD =
+LDLIBS += $(ZRECORD) -lmapmalloc -lc $(DLLIB)
LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2
LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2
diff --git a/usr/src/cmd/sgs/libcrle/Makefile.com b/usr/src/cmd/sgs/libcrle/Makefile.com
index 5ff1d69c30..67b5c36f16 100644
--- a/usr/src/cmd/sgs/libcrle/Makefile.com
+++ b/usr/src/cmd/sgs/libcrle/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -46,8 +46,8 @@ SRCDIR = ../common
DLLIB = $(VAR_DL_LIB)
package := DLLIB = $(VAR_PKG_DL_LIB)
-ZIGNORE =
-LDLIBS += -lmapmalloc $(DLLIB) -lc
+lint := ZRECORD =
+LDLIBS += $(ZRECORD) -lmapmalloc $(DLLIB) -lc
LINTFLAGS += -u
LINTFLAGS64 += -u
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index b7b4b5ac45..e219e178d3 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -60,11 +60,6 @@ ROOTDEMODIRS= $(ROOTDEMODIRBASE)
include $(SRC)/cmd/sgs/Makefile.com
-#
-# Do not compile the libelf.a objects with the -xF flag
-#
-$(OBJS) := XFFLAG=
-
WARLOCKFILES= $(OBJECTS:%.o=wlocks/%.ll)
MAPFILES = ../common/mapfile-common
diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com
index 0d0bbf0543..b7830a775a 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile.com
+++ b/usr/src/cmd/sgs/link_audit/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -30,8 +30,6 @@ include ../../Makefile.com
NO_ASM_WARN= -erroff=E_ASM_DISABLES_OPTIMIZATION
-ZIGNORE=
-
SGSPROTO= ../../proto/$(MACH)
TRUSSLIB= truss.so.1
@@ -82,11 +80,11 @@ $(WHOLIB):= PICS = $(WHOPICS)
$(SYMBINDREP):= PICS = $(SYMBINDREPPICS)
$(BINDLIB):= PICS = $(BINDPICS)
-$(TRUSSLIB):= LDLIBS += -lmapmalloc -lc
-$(PERFLIB):= LDLIBS += -lmapmalloc -lc
-$(WHOLIB):= LDLIBS += $(ELFLIBDIR) -lelf -lmapmalloc $(DLLIB) -lc
-$(SYMBINDREP):= LDLIBS += -lmapmalloc -lc
-$(BINDLIB):= LDLIBS += -lmapmalloc -lc
+$(TRUSSLIB):= LDLIBS += $(ZRECORD) -lmapmalloc -lc
+$(PERFLIB):= LDLIBS += $(ZRECORD) -lmapmalloc -lc
+$(WHOLIB):= LDLIBS += $(ELFLIBDIR) -lelf $(ZRECORD) -lmapmalloc $(DLLIB) -lc
+$(SYMBINDREP):= LDLIBS += $(ZRECORD) -lmapmalloc -lc
+$(BINDLIB):= LDLIBS += $(ZRECORD) -lmapmalloc -lc
$(TRUSSLIB):= SONAME = $(TRUSSLIB)
$(PERFLIB):= SONAME = $(PERFLIB)
diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README
index da788e445f..8269dd89ca 100644
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README
@@ -1194,10 +1194,12 @@ All the above changes are incorporated in the following patches:
6568745 segfault when using LD_DEBUG with bit_audit library when instrumenting
mozilla (D)
PSARC/2007/413 Add -zglobalaudit option to ld
+6602294 ps_pbrandname breaks apps linked directly against librtld_db
+ (link-editor components only)
--------------------------------------------------------------------------------
All the above changes are incorporated in the following patches:
- Solaris/SunOS 5.10_sparc patch T127111-XX
- Solaris/SunOS 5.10_x86 patch T127112-XX
+ Solaris/SunOS 5.10_sparc patch T127111-07
+ Solaris/SunOS 5.10_x86 patch T127112-07
--------------------------------------------------------------------------------
--------------
@@ -1277,8 +1279,6 @@ Bugid Risk Synopsis
shared object reference
6595139 various applications should export yy* global variables for libl
6597841 gelf_getdyn() reads one too many dynamic entries
-6602294 ps_pbrandname breaks apps linked directly against librtld_db
- (link-editor components only)
6603313 dlclose() can fail to unload objects after fix for 6573641
6234471 need a way to edit ELF objects (D)
PSARC/2007/509 elfedit
@@ -1305,3 +1305,4 @@ Bugid Risk Synopsis
usr/src/common/elfcap
6642769 ld(1) -z combreloc should become default behavior (D)
PSARC/2008/006: make ld(1) -z combreloc become default behavior
+6634436 XFFLAG should be updated. (link-editor components only)
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index fbc32c2d59..53625989fd 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -57,6 +57,8 @@ $(PICS) := CCFLAGS += $(XFFLAG)
$(PICS) := CFLAGS64 += $(XFFLAG)
$(PICS) := CCFLAGS64 += $(XFFLAG)
+DYNFLAGS += $(ZIGNORE)
+
LIBS = $(DYNLIB)
LIBNAME = $(LIBRARY:%.a=%)
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
index daa1aab50e..608208d0e8 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -54,6 +54,8 @@ $(PICS) := CCFLAGS += $(XFFLAG)
$(PICS) := CFLAGS64 += $(XFFLAG)
$(PICS) := CCFLAGS64 += $(XFFLAG)
+DYNFLAGS += $(ZIGNORE)
+
LIBS = $(DYNLIB)
LIBNAME = $(LIBRARY:%.a=%)
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
index f6086a0450..976aaba55f 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -54,6 +54,8 @@ $(PICS) := CCFLAGS += $(XFFLAG)
$(PICS) := CFLAGS64 += $(XFFLAG)
$(PICS) := CCFLAGS64 += $(XFFLAG)
+DYNFLAGS += $(ZIGNORE)
+
LIBS = $(DYNLIB)
LIBNAME = $(LIBRARY:%.a=%)
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
index 484c1257ce..b5ec7ef595 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -54,6 +54,8 @@ $(PICS) := CCFLAGS += $(XFFLAG)
$(PICS) := CFLAGS64 += $(XFFLAG)
$(PICS) := CCFLAGS64 += $(XFFLAG)
+DYNFLAGS += $(ZIGNORE)
+
LIBS = $(DYNLIB)
LIBNAME = $(LIBRARY:%.a=%)
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 2f3bf18abf..83bd77fed2 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -260,8 +260,10 @@ MAPFILES = ../mapfile-vers $(MAPFILE_EXPORT)
$(EXPORT_RELEASE_BUILD)include $(CLOSED)/lib/gss_mechs/mech_krb5/Makefile.export
#CPPFLAGS += -D_REENTRANT
-$(PICS) := CFLAGS += $(XFFLAG)
-$(PICS) := CCFLAGS += $(XFFLAG)
+$(PICS) := CFLAGS += $(XFFLAG)
+$(PICS) := CFLAGS64 += $(XFFLAG)
+$(PICS) := CCFLAGS += $(XFFLAG)
+$(PICS) := CCFLAGS64 += $(XFFLAG)
LIBS = $(DYNLIB) $(K5LIBLINK)
diff --git a/usr/src/lib/krb5/ss/Makefile.com b/usr/src/lib/krb5/ss/Makefile.com
index 5048cae0e1..9768d5fd1a 100644
--- a/usr/src/lib/krb5/ss/Makefile.com
+++ b/usr/src/lib/krb5/ss/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -69,7 +69,7 @@ CPPFLAGS += -DHAVE_LIBSOCKET=1 -DHAVE_LIBNSL=1 -DHAS_STRDUP=1 \
CFLAGS += $(CCVERBOSE) -I..
-DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
+DYNFLAGS += $(KRUNPATH) $(KMECHLIB) $(ZIGNORE)
LDLIBS += -lc
diff --git a/usr/src/lib/rpcsec_gss/Makefile.com b/usr/src/lib/rpcsec_gss/Makefile.com
index 942aeb68bb..7908550600 100644
--- a/usr/src/lib/rpcsec_gss/Makefile.com
+++ b/usr/src/lib/rpcsec_gss/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -35,7 +35,11 @@ include ../../Makefile.lib
CPPFLAGS += -D_REENTRANT -I$(SRC)/uts/common/gssapi/include \
-I$(SRC)/uts/common
-CFLAGS += $(XFFLAG)
+
+CFLAGS += $(XFFLAG)
+CFLAGS64 += $(XFFLAG)
+
+DYNFLAGS += $(ZIGNORE)
LINTSRC= $(LINTLIB:%.ln=%)