gcc.c (init_spec): Remove -lunwind from shared case.

2004-01-09   James E Wilson  <wilson@specifixinc.com>

	* gcc.c (init_spec): Remove -lunwind from shared case.
	* conifg/ia64/t-hpux (SHLIB_LINK): Add -lunwind.

From-SVN: r75611

gcc/ChangeLog

+2004-01-09   James E Wilson  <wilson@specifixinc.com>
+
+	* gcc.c (init_spec): Remove -lunwind from shared case.
+	* conifg/ia64/t-hpux (SHLIB_LINK): Add -lunwind.
+
 2004-01-09  Steve Ellcey  <sje@cup.hp.com>
 
 	* configure.ac: (gcc_cv_ld_hidden) Set to true for ia64*-*-hpux*.

gcc/config/ia64/t-hpux

@@ -26,9 +26,11 @@ LIBGCC1_TEST =
 LIB2ADDEH =
 
 SHLIB_EXT = .so
+# Must include -lunwind in the link, so that libgcc_s.so has the necessary
+# DT_NEEDED entry for libunwind.
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 	-Wl,+h,@shlib_base_name@.so.0 \
-	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc && \
+	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lunwind -lc && \
 	rm -f @shlib_base_name@.so.0 && \
 	$(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
 # $(slibdir) double quoted to protect it from expansion while building

gcc/gcc.c

@@ -1633,9 +1633,6 @@ init_spec (void)
 #else
 			    "-lgcc_s%M"
 #endif
-#ifdef USE_LIBUNWIND_EXCEPTIONS
-			    " -lunwind"
-#endif
 			    ,
 			    "-lgcc",
 			    "-lgcc_eh"
@@ -1657,9 +1654,6 @@ init_spec (void)
 #else
 			    "-lgcc_s%M"
 #endif
-#ifdef USE_LIBUNWIND_EXCEPTIONS
-			    " -lunwind"
-#endif
 			    ,
 			    "libgcc.a%s",
 			    "libgcc_eh.a%s"