gcc.c (init_gcc_specs): Revert patch from 2002-02-15.

	* gcc.c (init_gcc_specs): Revert patch from 2002-02-15.
	* config/pa/pa-linux.h (LIB_SPEC): Likewise.
	* config/pa/pa32-linux.h (LINK_COMMAND_SPEC): Likewise.

From-SVN: r49794

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4f023f9670ce79d51c9a285ad3dff5ec109c2c0..570574474e6cdc878eb9bc0a566642430ce7befa 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-15  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * gcc.c (init_gcc_specs): Revert patch from 2002-02-15.
+       * config/pa/pa-linux.h (LIB_SPEC): Likewise.
+       * config/pa/pa32-linux.h (LINK_COMMAND_SPEC): Likewise.
+
 2002-02-15  Richard Sandiford  <rsandifo@redhat.com>
 
        * c-decl.c (grokdeclarator): Prevent a segfault on unnamed decls.

diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h
index a0707f7164ac19283653e6fca034cc2a9bab013b..7138e755d25fb746c358f9cd705568ed8f242620 100644 (file)
--- a/gcc/config/pa/pa-linux.h
+++ b/gcc/config/pa/pa-linux.h
@@ -27,6 +27,9 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ELF__ -Dunix -D__hppa__ -Dlinux -Asystem=unix -Asystem=posix -Acpu=hppa -Amachine=hppa -Amachine=bigendian"
 
+#undef LIB_SPEC
+#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
+
 #undef ASM_SPEC
 #define ASM_SPEC \
   "%{v:-V} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}"

diff --git a/gcc/config/pa/pa32-linux.h b/gcc/config/pa/pa32-linux.h
index 81f64529a3a18db59162ee79ecd1cddb93495bc9..09bd44d89654f67e25ab526e2faaeb9a09e747d8 100644 (file)
--- a/gcc/config/pa/pa32-linux.h
+++ b/gcc/config/pa/pa32-linux.h
@@ -24,3 +24,14 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CPP_SPEC
 #define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{mhppa:-D__hppa__} %{posix:-D_POSIX_SOURCE} -D_PA_RISC1_1"
+
+/* We need to link against libgcc.a to resolve millicode references.  */
+#undef LINK_COMMAND_SPEC
+#define LINK_COMMAND_SPEC "\
+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
+    %(linker) %l %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r} %{s} %{t}\
+    %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
+    %{static:} %{L*} %(link_libgcc) %o %{!nostdlib:%{!nodefaultlibs:%G %L %G}}\
+    %{!A:%{!nostdlib:%{!nostartfiles:%E}}}\
+    %{!nostdlib:%{!nodefaultlibs:%{!static:%{!static-libgcc:-lgcc}}}}\
+    %{T*} }}}}}}"

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 84f1a1dddfea46d15fe1d8ce0ea90061d4cc67d5..41c62a9e4fe4d6e87c771d2629be10d3cde4291a 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1430,7 +1430,7 @@ init_gcc_specs (obstack, shared_name, static_name, eh_name)
 #ifdef LINK_EH_SPEC
   sprintf (buffer, "%s}}}", static_name);
 #else
-  sprintf (buffer, "%s %s}}}", shared_name, static_name);
+  sprintf (buffer, "%s}}}", shared_name);
 #endif
   obstack_grow (obstack, buffer, strlen (buffer));
   /* Otherwise, use the static version.  */