From aedec8ddd22c81f7afec5423accb4175cad874b0 Mon Sep 17 00:00:00 2001
From: James E Wilson <wilson@specifixinc.com>
Date: Thu, 4 Dec 2003 06:07:03 +0000
Subject: [PATCH] libunwind cleanup

libunwind cleanup
* gcc.c (init_spec): Pass -lunwind to init_gcc_specs in eh_name.
* g++spec.c (lang_specific_driver): Delete USE_LIBUNWIND_EXCEPTIONS
support.

From-SVN: r74273
---
 gcc/ChangeLog    | 2 ++
 gcc/cp/ChangeLog | 5 +++++
 gcc/cp/g++spec.c | 7 -------
 gcc/gcc.c        | 6 +++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98e7534aeb7..2e632146853 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -7,6 +7,8 @@
 
 2003-12-03  James E Wilson  <wilson@specifixinc.com>
 
+	* gcc.c (init_spec): Pass -lunwind to init_gcc_specs in eh_name.
+
 	* gcc-page.c (extra_order_size_tab): Correct comment.
 
 2003-12-03  Kazu Hirata  <kazu@cs.umass.edu>
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dbb0d003772..451b459c323 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-03  James E Wilson  <wilson@specifixinc.com>
+
+	* g++spec.c (lang_specific_driver): Delete USE_LIBUNWIND_EXCEPTIONS
+	support.
+
 2003-12-03  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/13179
diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index 4951ff3211e..e6c9ee6892a 100644
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -302,13 +302,6 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
     {
       arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
       added_libraries++;
-#ifdef USE_LIBUNWIND_EXCEPTIONS
-# ifndef LIBUNWIND
-#  define LIBUNWIND "-lunwind"
-# endif
-      arglist[j++] = LIBUNWIND;
-      added_libraries++;
-#endif
     }
   if (saw_math)
     arglist[j++] = saw_math;
diff --git a/gcc/gcc.c b/gcc/gcc.c
index f6f0ec15f41..7b9ea63e971 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1656,7 +1656,11 @@ init_spec (void)
 #endif
 			    ,
 			    "libgcc.a%s",
-			    "libgcc_eh.a%s");
+			    "libgcc_eh.a%s"
+#ifdef USE_LIBUNWIND_EXCEPTIONS
+			    " -lunwind"
+#endif
+			    );
 	    p += 10;
 	    in_sep = 0;
 	  }