diff options
| author | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 22:14:25 +0000 |
|---|---|---|
| committer | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 22:14:25 +0000 |
| commit | 4515af0bd155c514cab4be94fe8107677111460e (patch) | |
| tree | fec88357ea05e520c8c9d5a9e43dd58e16fc53cd /gcc | |
| parent | 52fc952852e1f289d84696f9b74a8be4725784b2 (diff) | |
| download | gcc-4515af0bd155c514cab4be94fe8107677111460e.tar.gz | |
* gcc.c (init_gcc_specs): Add static libgcc to link when "-shared"
is specified.
* config/pa/pa-linux.h (LIB_SPEC): Delete.
* config/pa/pa32-linux.h (LINK_COMMAND_SPEC): Delete.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49684 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/pa/pa-linux.h | 5 | ||||
| -rw-r--r-- | gcc/config/pa/pa32-linux.h | 13 | ||||
| -rw-r--r-- | gcc/gcc.c | 2 |
4 files changed, 10 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3ca0f0f6a3a..7608058f1bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2002-02-11 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * gcc.c (init_gcc_specs): Add static libgcc to link when "-shared" + is specified. + * config/pa/pa-linux.h (LIB_SPEC): Delete. + * config/pa/pa32-linux.h (LINK_COMMAND_SPEC): Delete. + 2002-02-11 Andrew Haley <aph@cambridge.redhat.com> * config/stormy16/stormy16.md (zero_extendqihi2): New. diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h index 49e167cf824..a0707f7164a 100644 --- a/gcc/config/pa/pa-linux.h +++ b/gcc/config/pa/pa-linux.h @@ -1,5 +1,5 @@ /* Definitions for PA_RISC with ELF format - Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -27,9 +27,6 @@ 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 8df3257734b..81f64529a3a 100644 --- a/gcc/config/pa/pa32-linux.h +++ b/gcc/config/pa/pa32-linux.h @@ -1,5 +1,5 @@ /* Definitions for PA_RISC with ELF-32 format - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -24,14 +24,3 @@ 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 41c62a9e4fe..84f1a1dddfe 100644 --- 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}}}", shared_name); + sprintf (buffer, "%s %s}}}", shared_name, static_name); #endif obstack_grow (obstack, buffer, strlen (buffer)); /* Otherwise, use the static version. */ |