From 17772b2a167b38415145fc87500eec69bb912632 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 10 Dec 2002 11:55:32 +0100 Subject: [PATCH] linux.h (LIB_SPEC): If -pthread, add -lpthread even if -shared. * config/linux.h (LIB_SPEC): If -pthread, add -lpthread even if -shared. * config/alpha/linux-elf.h (LIB_SPEC): Likewise. * config/alpha/linux.h (LIB_SPEC): Likewise. * config/arm/linux-elf.h (LIB_SPEC): Likewise. * config/pa/pa-linux.h (LIB_SPEC): Likewise. * config/sparc/linux.h (LIB_SPEC): Likewise. * config/sparc/linux64.h (LIB_SPEC): Likewise. From-SVN: r59992 --- gcc/ChangeLog | 11 +++++++++++ gcc/config/alpha/linux-elf.h | 2 +- gcc/config/alpha/linux.h | 6 +++--- gcc/config/arm/linux-elf.h | 6 +++--- gcc/config/linux.h | 6 +++--- gcc/config/pa/pa-linux.h | 6 +++--- gcc/config/sparc/linux.h | 6 +++--- gcc/config/sparc/linux64.h | 6 +++--- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e5f9ed5e78d..91f44af8ec1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2002-12-10 Jakub Jelinek + + * config/linux.h (LIB_SPEC): If -pthread, add -lpthread even if + -shared. + * config/alpha/linux-elf.h (LIB_SPEC): Likewise. + * config/alpha/linux.h (LIB_SPEC): Likewise. + * config/arm/linux-elf.h (LIB_SPEC): Likewise. + * config/pa/pa-linux.h (LIB_SPEC): Likewise. + * config/sparc/linux.h (LIB_SPEC): Likewise. + * config/sparc/linux64.h (LIB_SPEC): Likewise. + 2002-12-09 Larin Hennessy * doc/invoke.texi: Document UltraSparc III option. diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index 506a103df5f..49f518137e1 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -45,5 +45,5 @@ Boston, MA 02111-1307, USA. */ #ifndef USE_GNULIBC_1 #undef LIB_SPEC #define LIB_SPEC \ -"%{shared:-lc}%{!shared:%{pthread:-lpthread }%{profile:-lc_p}%{!profile:-lc}} " +"%{pthread:-lpthread }%{shared:-lc}%{!shared:%{profile:-lc_p}%{!profile:-lc}} " #endif diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h index 461bd0e764e..28ff3208422 100644 --- a/gcc/config/alpha/linux.h +++ b/gcc/config/alpha/linux.h @@ -37,9 +37,9 @@ Boston, MA 02111-1307, USA. */ #undef LIB_SPEC #define LIB_SPEC \ - "%{shared: -lc} \ - %{!shared: %{pthread:-lpthread} \ - %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared: %{profile:-lc_p}%{!profile:-lc}}" /* Show that we need a GP when profiling. */ #undef TARGET_PROFILING_NEEDS_GP diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h index 792ea736265..c6d14e769f1 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -48,9 +48,9 @@ Boston, MA 02111-1307, USA. */ /* Now we define the strings used to build the spec file. */ #define LIB_SPEC \ - "%{shared: -lc} \ - %{!shared: %{pthread:-lpthread} \ - %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" #define LIBGCC_SPEC "%{msoft-float:-lfloat} -lgcc" diff --git a/gcc/config/linux.h b/gcc/config/linux.h index 5b7311c1697..2b1e50f3bde 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -93,9 +93,9 @@ Boston, MA 02111-1307, USA. */ %{!profile:%{!ggdb:-lc} %{ggdb:-lg}}}" #else #define LIB_SPEC \ - "%{shared: -lc} \ - %{!shared: %{mieee-fp:-lieee} %{pthread:-lpthread} \ - %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared:%{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}}" #endif #else #define LIB_SPEC \ diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h index 5b3c7045165..495046e762b 100644 --- a/gcc/config/pa/pa-linux.h +++ b/gcc/config/pa/pa-linux.h @@ -71,9 +71,9 @@ Boston, MA 02111-1307, USA. */ #undef LIB_SPEC #define LIB_SPEC \ - "%{shared: -lgcc -lc} \ - %{!shared: %{mieee-fp:-lieee} %{pthread:-lpthread} \ - %{shared-libgcc: -lgcc} %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lgcc -lc} \ + %{!shared:%{mieee-fp:-lieee} %{shared-libgcc:-lgcc} %{profile:-lc_p}%{!profile:-lc}}" #undef ASM_SPEC #define ASM_SPEC \ diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index dcf79e858bb..ea16b7eed5d 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -123,9 +123,9 @@ Boston, MA 02111-1307, USA. */ %{!profile:%{!ggdb:-lc} %{ggdb:-lg}}}" #else #define LIB_SPEC \ - "%{shared: -lc} \ - %{!shared: %{mieee-fp:-lieee} %{pthread:-lpthread} \ - %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared:%{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}}" #endif #else #define LIB_SPEC \ diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index eb81eb61401..8fd3a1ff0df 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -124,9 +124,9 @@ Boston, MA 02111-1307, USA. */ #undef LIB_SPEC #define LIB_SPEC \ - "%{shared: -lc} \ - %{!shared: %{mieee-fp:-lieee} %{pthread:-lpthread} \ - %{profile:-lc_p} %{!profile: -lc}}" + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared: %{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}}" /* Provide a LINK_SPEC appropriate for GNU/Linux. Here we provide support for the special GCC options -static and -shared, which allow us to -- 2.30.2