summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/Makefile.cmd4
-rw-r--r--usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com4
-rw-r--r--usr/src/cmd/dtrace/test/tst/i386/Makefile4
-rw-r--r--usr/src/cmd/lp/lib/papi/Makefile4
-rw-r--r--usr/src/cmd/perl/5.6.1/distrib/Makefile.lib8
-rw-r--r--usr/src/cmd/perl/5.8.4/distrib/Makefile.lib8
-rw-r--r--usr/src/cmd/sgs/ld/Makefile.com4
-rw-r--r--usr/src/cmd/sgs/libld/Makefile.com5
-rw-r--r--usr/src/cmd/sgs/packages/common/SUNWonld-README1
-rw-r--r--usr/src/cmd/sgs/rtld/common/elf.c4
10 files changed, 28 insertions, 18 deletions
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index 09e3e1d378..0f1ea15e91 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -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"
@@ -138,7 +138,7 @@ PLATEXEC= $(ROOT)/usr/lib/platexec
LDLIBS = $(LDLIBS.cmd)
LDFLAGS.cmd = \
- $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
+ $(BDIRECT) $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
$(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
LDFLAGS = $(LDFLAGS.cmd)
diff --git a/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com b/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
index 58d4ac839f..3f32b0c205 100644
--- a/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
+++ b/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
@@ -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"
@@ -66,7 +66,7 @@ $(ROOTBIN64)/%: %
$(INS.file)
$(ROOTISAEXEC):
- $(RM) $@; $(CP) -p /usr/lib/isaexec $@
+ -$(LN) $(ISAEXEC) $@
$(ROOTBIN)/%: $(ROOTBIN)
$(INS.dir)
diff --git a/usr/src/cmd/dtrace/test/tst/i386/Makefile b/usr/src/cmd/dtrace/test/tst/i386/Makefile
index 6a1c326598..5eecf2885e 100644
--- a/usr/src/cmd/dtrace/test/tst/i386/Makefile
+++ b/usr/src/cmd/dtrace/test/tst/i386/Makefile
@@ -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"
@@ -32,7 +32,7 @@ ASFLAGS += -P -D_ASM $(CPPFLAGS)
CLOBBER_FILES += helper_helper.o annotated_helper.o
# For the helper test we require an executable data section.
-ustack/tst.helper.exe := LDFLAGS = -M$(MAPFILE.NES)
+ustack/tst.helper.exe := LDFLAGS += -M$(MAPFILE.NES)
ustack/tst.helper.exe: ustack/tst.helper.o ustack/helper_helper.o
$(LINK.c) -o ustack/tst.helper.exe \
diff --git a/usr/src/cmd/lp/lib/papi/Makefile b/usr/src/cmd/lp/lib/papi/Makefile
index 2622951255..0db8138e89 100644
--- a/usr/src/cmd/lp/lib/papi/Makefile
+++ b/usr/src/cmd/lp/lib/papi/Makefile
@@ -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"
@@ -56,8 +56,6 @@ LDLIBS += -L$(SRC)/cmd/lp/lib/lp -llp
MAPFILES = mapfile
-DYNFLAGS += $(BDIRECT)
-
LIBS = $(DYNLIB)
SRCS= $(OBJECTS:%.o=%.c)
diff --git a/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib b/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
index c559d39e2e..88ec1861d4 100644
--- a/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
+++ b/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
@@ -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"
@@ -76,6 +76,12 @@ include ../Makefile.perlcfg
# There should be a mapfile here
MAPFILES =
+# Disable perl from directly binding to itself, but allow perl to directly bind
+# to its dependencies (ie. map -Bdirect -> -zdirect). Ensure lazy loading is
+# established (which is enabled automatically with -Bdirect).
+BDIRECT = $(ZDIRECT)
+LDFLAGS += $(ZLAZYLOAD)
+
# Add in the perl-specific flags (including largefile flags).
CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS)
diff --git a/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib b/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
index b5e6a6950f..8bcb2db4b5 100644
--- a/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
+++ b/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
@@ -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"
@@ -82,6 +82,12 @@ include ../Makefile.perlcfg
# There should be a mapfile here
MAPFILES =
+# Disable perl from directly binding to itself, but allow perl to directly bind
+# to its dependencies (ie. map -Bdirect -> -zdirect). Ensure lazy loading is
+# established (which is enabled automatically with -Bdirect).
+BDIRECT = $(ZDIRECT)
+LDFLAGS += $(ZLAZYLOAD)
+
# Add in the perl-specific flags (including largefile flags).
CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS)
diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com
index bfb3c79767..4c655d5941 100644
--- a/usr/src/cmd/sgs/ld/Makefile.com
+++ b/usr/src/cmd/sgs/ld/Makefile.com
@@ -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"
@@ -40,7 +40,7 @@ OBJS = $(BLTOBJ) $(COMOBJS)
MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
MAPOPTS = $(MAPFILES:%=-M%)
-LDFLAGS += $(VERSREF) $(LAZYLOAD) $(BDIRECT) $(USE_PROTO) $(MAPOPTS) \
+LDFLAGS += $(VERSREF) $(LAZYLOAD) $(USE_PROTO) $(MAPOPTS) \
$(VAR_LD_LLDFLAGS)
LDLIBS += $(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \
$(LDDBGLIBDIR) $(LDDBG_LIB) $(CONVLIBDIR) $(CONV_LIB)
diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com
index 8f7df55423..46a4e4ddeb 100644
--- a/usr/src/cmd/sgs/libld/Makefile.com
+++ b/usr/src/cmd/sgs/libld/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"
@@ -82,8 +82,7 @@ LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(LDDBGLIBDIR) $(LDDBG_LIB) \
LINTFLAGS += -u -D_REENTRANT
LINTFLAGS64 += -u -D_REENTRANT
-DYNFLAGS += $(BDIRECT) $(VERSREF) \
- $(ZLAZYLOAD) $(USE_PROTO) '-R$$ORIGIN'
+DYNFLAGS += $(VERSREF) $(ZLAZYLOAD) $(USE_PROTO) '-R$$ORIGIN'
$(VAR_POUND_3)DEFS=
native:= DYNFLAGS += $(CONVLIBDIR)
diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README
index e98ee1d44b..373fc7be98 100644
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README
@@ -1307,3 +1307,4 @@ Bugid Risk Synopsis
PSARC/2008/006: make ld(1) -z combreloc become default behavior
6634436 XFFLAG should be updated. (link-editor components only)
6492726 Merge SHF_MERGE|SHF_STRINGS input sections
+4947191 OSNet should use direct bindings (link-editor components only)
diff --git a/usr/src/cmd/sgs/rtld/common/elf.c b/usr/src/cmd/sgs/rtld/common/elf.c
index 42589fff1e..45e64a557b 100644
--- a/usr/src/cmd/sgs/rtld/common/elf.c
+++ b/usr/src/cmd/sgs/rtld/common/elf.c
@@ -351,8 +351,8 @@ elf_lazy_load(Rt_map *clmp, uint_t ndx, const char *sym)
* create an association between the caller and this dependency.
*/
if (nlmp && (((analyze_lmc(lml, lmco, nlmp) == 0)) ||
- (relocate_lmc(lml, lmco, clmp, nlmp) == 0) ||
- (bind_one(clmp, nlmp, BND_NEEDED) == 0)))
+ (bind_one(clmp, nlmp, BND_NEEDED) == 0) ||
+ (relocate_lmc(lml, lmco, clmp, nlmp) == 0)))
dip->di_info = nlmp = 0;
/*
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-12 09:13:54 +0000