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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 098b67e14663e0c7b48d731c2a491cd10305de73..06768ae27d626d80e821ff41f545e67c3f222465 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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*.
@@ -40,7 +45,7 @@
        (expand_end_bindings): Save and restor last_expr_alt_rtl.
        * tree.def (RTL_EXPR): Give it an additional operand.
        * tree.h (RTL_EXPR_ALT_RTL): New macro.
-       
+
 2004-01-09  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
        * config/m32r/m32r.h (TARGET_CPU_CPP_BUILTINS): Add __m32r__.
@@ -86,10 +91,10 @@
 
        PR opt/12441
        Revert: Sat Mar 30 14:08:55 CET 2002  Jan Hubicka  <jh@suse.cz>
-        * i386.c (aligned_operand): Be prepared for SUBREGed registers.
-        (ix86_decompose_address): Use REG_P instead of GET_CODE (...) == REG.
-        (ix86_address_cost): Be prepared for SUBREGed registers.
-        (legitimate_address_p): Accept SUBREGed registers.
+       * i386.c (aligned_operand): Be prepared for SUBREGed registers.
+       (ix86_decompose_address): Use REG_P instead of GET_CODE (...) == REG.
+       (ix86_address_cost): Be prepared for SUBREGed registers.
+       (legitimate_address_p): Accept SUBREGed registers.
 
 2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>
 

diff --git a/gcc/config/ia64/t-hpux b/gcc/config/ia64/t-hpux
index 48baadd65824a4f0346715c358e0e118f3adeac1..597c2acbe2ae1414092e0554779e6dcb8258a31a 100644 (file)
--- a/gcc/config/ia64/t-hpux
+++ b/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

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 27024fa9e4e537c8c4b462f47c632822a20c7d6e..bc6d4c4235bc49ff815e265ca711974b16ab2509 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1632,9 +1632,6 @@ init_spec (void)
                            "-lgcc_s"
 #else
                            "-lgcc_s%M"
-#endif
-#ifdef USE_LIBUNWIND_EXCEPTIONS
-                           " -lunwind"
 #endif
                            ,
                            "-lgcc",
@@ -1656,9 +1653,6 @@ init_spec (void)
                            "-lgcc_s"
 #else
                            "-lgcc_s%M"
-#endif
-#ifdef USE_LIBUNWIND_EXCEPTIONS
-                           " -lunwind"
 #endif
                            ,
                            "libgcc.a%s",