From: Steve Ellcey <sje@cup.hp.com>
Date: Wed, 16 Nov 2005 17:06:52 +0000 (+0000)
Subject: re PR target/24718 (Shared libgcc not used for linking by default)
X-Git-Tag: releases/gcc-3.4.5~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbea392ac68898bf37cfd38bc0ce4cdb5cdf5f2;p=thirdparty%2Fgcc.git

re PR target/24718 (Shared libgcc not used for linking by default)

	PR target/24718
	* mklibgcc.in: Create dummy object for libgcc_eh.a
	* config/ia64/hpux.h (LIBGCC_SPEC): Remove.

From-SVN: r107090
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46f8464bcc5d..b5b3a51a1119 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-16  Steve Ellcey  <sje@cup.hp.com>
+
+	PR target/24718
+	* mklibgcc.in: Create dummy object for libgcc_eh.a
+	* config/ia64/hpux.h (LIBGCC_SPEC): Remove.
+
 2005-11-13  Andreas Jaeger  <aj@suse.de>
 
 	* fixinc/check.tpl: Handle CVS additionally.
diff --git a/gcc/config/ia64/hpux.h b/gcc/config/ia64/hpux.h
index f76cbd232163..09fb53f44b08 100644
--- a/gcc/config/ia64/hpux.h
+++ b/gcc/config/ia64/hpux.h
@@ -84,13 +84,6 @@ do {							\
 	  %{mlp64:-L/usr/lib/hpux64/libp} -lgprof} \
      %{!symbolic:-lc}}"
 
-#ifndef CROSS_COMPILE
-#undef LIBGCC_SPEC
-#define LIBGCC_SPEC \
-  "%{shared-libgcc:%{!mlp64:-lgcc_s}%{mlp64:-lgcc_s_hpux64} -lgcc} \
-   %{!shared-libgcc:-lgcc}"
-#endif
-
 #undef SUBTARGET_SWITCHES
 #define SUBTARGET_SWITCHES \
   { "ilp32",    MASK_ILP32,     "Generate ILP32 code" }, \
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index 143b4e83ba18..8fafce4b0205 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -246,6 +246,9 @@ for file in $LIB2ADDEH; do
   fi
 done
 
+# Flag whether we need eh_dummy.c
+need_eh_dummy=
+
 if [ "$SHLIB_LINK" ]; then
   # Those should be in libgcc_eh.a.
   for file in $LIB2ADDEHSTATIC; do
@@ -260,6 +263,23 @@ if [ "$SHLIB_LINK" ]; then
     oname=`echo $name | sed -e 's,.*/,,'`
     libgcc2_eh_shared_objs="$libgcc2_eh_shared_objs ${oname}${objext}"
   done
+
+  # If nothing went into libgcc_eh.a, create a dummy object -
+  # some linkers don't like totally empty archives.
+  if [ -z "$LIB2ADDEHSTATIC" ]; then
+      file=eh_dummy.c
+      libgcc2_eh_static_objs="$libgcc2_eh_static_objs eh_dummy${objext}"
+      need_eh_dummy=1
+
+      for ml in $MULTILIBS; do
+        dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
+        flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
+        out="libgcc/${dir}/eh_dummy${objext}"
+
+        echo $out: stmp-dirs $file
+        echo "	$gcc_compile" $flags -fexceptions -c $file -o $out
+      done
+  fi
 fi
 
 for file in $LIB2ADD_ST; do
@@ -649,6 +669,11 @@ done
 echo ""
 echo "all: $all"
 
+if [ "$need_eh_dummy" ]; then
+  echo "eh_dummy.c:"
+  echo "	echo 'int __libgcc_eh_dummy;' > \$@"
+fi
+
 echo ""
 echo "install: $all"
 for ml in $MULTILIBS; do