From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 4 May 2004 19:22:53 +0000 (+0000)
Subject: * shlib.conf (alpha*-dec-osf*): Do remember to set use_linker_init_option and
X-Git-Tag: krb5-1.4-beta1~448
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9143795064f9dc9a62ddbf37a628b8ac4cabf2f9;p=krb5.git

* shlib.conf (alpha*-dec-osf*): Do remember to set use_linker_init_option and
use_linker_fini_option.
(mips-sgi-irix*): Set LDCOMBINE_TAIL only if not using gcc.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16297 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 3b0985361..d54db188d 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* shlib.conf (alpha*-dec-osf*): Do remember to set
+	use_linker_init_option and use_linker_fini_option.
+	(mips-sgi-irix*): Set LDCOMBINE_TAIL only if not using gcc.
+
 2004-04-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* shlib.conf (alpha*-dec-osf*): Add support for export list, using
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 854dbc2c8..a69040270 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -38,6 +38,8 @@ alpha*-dec-osf*)
 	SHOBJEXT=.o
 	INIT_FINI_PREP='if test -z "$(LIBINITFUNC)"; then initfini=""; else initfini="-Wl,-init,$(LIBINITFUNC)__auxinit"; fi; if test -z "$(LIBFINIFUNC)";then :;else initfini="$$initfini -Wl,-fini,$(LIBFINIFUNC)"; fi'
 	LDCOMBINE='sed "s/^/-exported_symbol /" < $(SHLIB_EXPORT_FILE) > export && $(CC) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIB)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,export $$initfini'
+	use_linker_init_option=yes
+	use_linker_fini_option=yes
 	EXTRA_FILES="$EXTRA_FILES export"
 	SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
 	PROFFLAGS=-pg
@@ -132,14 +134,14 @@ mips-sgi-irix*)
 	SHLIBEXT=.so
 	SHOBJEXT=.o
 	if test "$krb5_cv_prog_gcc" = yes; then
-		:
+		LDCOMBINE_TAIL=""
 	else
 		use_linker_init_option=yes
 		use_linker_fini_option=yes
 		INIT_FINI_PREP='if test -z "$(LIBINITFUNC)"; then initfini=""; else initfini="-Wl,-init,$(LIBINITFUNC)__auxinit"; fi; if test -z "$(LIBFINIFUNC)";then :;else initfini="$$initfini -Wl,-fini,$(LIBFINIFUNC)"; fi'
+		LDCOMBINE_TAIL='-Wl,-exports_file -Wl,$(SHLIB_EXPORT_FILE)'
 	fi
 	LDCOMBINE='$(CC) -shared -Wl,-ignore_unresolved -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIB)$(SHLIBSEXT) $$initfini'
-	LDCOMBINE_TAIL='-Wl,-exports_file -Wl,$(SHLIB_EXPORT_FILE)'
 	SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
 	# no gprof for Irix...
 	PROFFLAGS=-p