From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 22 Nov 2004 15:48:32 +0000 (+0000)
Subject: * m4/libtool.m4, tests/demo-nopic.test: Undo bogus commit.
X-Git-Tag: release-2-1b~850
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2984dc45e12566866e169bddf1fcd525618a125;p=thirdparty%2Flibtool.git

* m4/libtool.m4, tests/demo-nopic.test: Undo bogus commit.
---

diff --git a/ChangeLog b/ChangeLog
index d08df833c..74d58ce50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-22  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* m4/libtool.m4, tests/demo-nopic.test: Undo bogus commit.
+
 	* config/ltmain.m4sh (func_mode_link), tests/objectlist.test:
 	Make sure the argument to `-objectlist' may contain spaces.
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 744443fdc..4240a5eb0 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4120,11 +4120,11 @@ _LT_EOF
       ;;
 
     solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -z text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$ECHO "local: *; };" >> $lib.exp~
-	  $CC -shared -z text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test
index c7133c3d6..0aa901c5e 100755
--- a/tests/demo-nopic.test
+++ b/tests/demo-nopic.test
@@ -27,9 +27,6 @@ case "$host" in
 hppa*|x86_64*|s390*)
 	func_skip "$host doesn't like non-PIC shared libs"
 	;;
-	*-solaris*|*-sunos*)
-	func_skip "libtool does not build non-PIC shared libs on $host_os"
-	;;
 esac
 
 func_rmprefixdir