From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 17 Jun 1998 10:31:24 +0000 (+0000)
Subject: dwarf2out.c: Disable EH_FRAME_SECTION if we don't have .init.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d460fb3cdd284fb444d228af2f2f0b2c885b33b1;p=gcc.git

dwarf2out.c: Disable EH_FRAME_SECTION if we don't have .init.

        * dwarf2out.c: Disable EH_FRAME_SECTION if we don't have .init.
        * configure.in: Don't disable collect2 when we have GNU ld.

From-SVN: r20536
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 88a56d68cb7..601d4da7997 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1998-06-17  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* dwarf2out.c: Disable EH_FRAME_SECTION if we don't have .init.
+
+	* configure.in: Don't disable collect2 when we have GNU ld.
+
 Wed Jun 17 08:38:13 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* configure.in (nm): Make a link to "nm" in the build tree too.
diff --git a/gcc/configure b/gcc/configure
index 135603747f1..1390118fbaa 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -4763,11 +4763,11 @@ for machine in $build $host $target; do
 	fi
 
 	# No need for collect2 if we have the GNU linker.
-	case x$gnu_ld in
-	xyes)
-		use_collect2=
-		;;
-	esac
+	# Actually, there is now; GNU ld doesn't handle the EH info or
+	# collecting for shared libraries.
+	# Instead we always turn on use_collect2; it's a rather heavyweight
+	# solution to the problem, but it works.
+	use_collect2=yes
 
 # Save data on machine being used to compile GCC in build_xm_file.
 # Save data on host machine in vars host_xm_file and host_xmake_file.
diff --git a/gcc/configure.in b/gcc/configure.in
index 1575f8889a7..377e54521b4 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2919,11 +2919,11 @@ for machine in $build $host $target; do
 	fi
 
 	# No need for collect2 if we have the GNU linker.
-	case x$gnu_ld in
-	xyes)
-		use_collect2=
-		;;
-	esac
+	# Actually, there is now; GNU ld doesn't handle the EH info or
+	# collecting for shared libraries.
+	# Instead we always turn on use_collect2; it's a rather heavyweight
+	# solution to the problem, but it works.
+	use_collect2=yes
 
 # Save data on machine being used to compile GCC in build_xm_file.
 # Save data on host machine in vars host_xm_file and host_xmake_file.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 52f02cd5c94..6d6a502c4e4 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -1624,6 +1624,11 @@ output_cfi (cfi, fde)
 #endif
 #endif
 
+/* If we aren't using crtstuff to run ctors, don't use it for EH.  */
+#if !defined (HAS_INIT_SECTION) && !defined (INIT_SECTION_ASM_OP)
+#undef EH_FRAME_SECTION
+#endif
+
 /* Output the call frame information used to used to record information
    that relates to calculating the frame pointer, and records the
    location of saved registers.  */