From b6e375800c9a2f02a732cbdf5e87a860c3d954e1 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 27 Dec 2012 09:14:35 +0800 Subject: Fix OpenMP Based on 1271761f530c0050154e8d526b95f952df551751, 92c478dba755a1a2f6f00ff390666acbffd41982, and 51df2e98d22e2c6f5d2a16860bc8fc3644179c1d. With the following modifications: 1. Translate -pthread to -lc instead of -lpthread Android doesn't have (has pthread* in libc.so instead) 2. Because of 1., we can restore to the original order of LINUX_OR_ANDROID_LD Change-Id: I505250c32b9908cb17bb269dc26e73c91669c07f --- gcc-4.4.3/gcc/config/arm/linux-eabi.h | 2 +- gcc-4.4.3/gcc/config/i386/linux.h | 2 +- gcc-4.4.3/gcc/config/linux-android.h | 2 +- gcc-4.4.3/gcc/config/linux.h | 8 +++++--- gcc-4.4.3/gcc/config/mips/linux.h | 9 ++++++--- 5 files changed, 14 insertions(+), 9 deletions(-) (limited to 'gcc-4.4.3') diff --git a/gcc-4.4.3/gcc/config/arm/linux-eabi.h b/gcc-4.4.3/gcc/config/arm/linux-eabi.h index d44fcddda..52b4b5373 100644 --- a/gcc-4.4.3/gcc/config/arm/linux-eabi.h +++ b/gcc-4.4.3/gcc/config/arm/linux-eabi.h @@ -87,7 +87,7 @@ #undef LIB_SPEC #define LIB_SPEC \ LINUX_OR_ANDROID_LD (LINUX_TARGET_LIB_SPEC, \ - ANDROID_LIB_SPEC " " LINUX_TARGET_LIB_SPEC ) + LINUX_TARGET_LIB_SPEC_LESS_PTHREAD " " ANDROID_LIB_SPEC) #undef STARTFILE_SPEC #define STARTFILE_SPEC \ diff --git a/gcc-4.4.3/gcc/config/i386/linux.h b/gcc-4.4.3/gcc/config/i386/linux.h index 12451fef8..8d3aa87ee 100644 --- a/gcc-4.4.3/gcc/config/i386/linux.h +++ b/gcc-4.4.3/gcc/config/i386/linux.h @@ -97,7 +97,7 @@ along with GCC; see the file COPYING3. If not see #undef LIB_SPEC #define LIB_SPEC \ LINUX_OR_ANDROID_LD (LINUX_TARGET_LIB_SPEC, \ - LINUX_TARGET_LIB_SPEC " " ANDROID_LIB_SPEC) + LINUX_TARGET_LIB_SPEC_LESS_PTHREAD " " ANDROID_LIB_SPEC) #undef STARTFILE_SPEC #define STARTFILE_SPEC \ diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h index b5bc2bb64..7f6076293 100644 --- a/gcc-4.4.3/gcc/config/linux-android.h +++ b/gcc-4.4.3/gcc/config/linux-android.h @@ -54,7 +54,7 @@ #define ANDROID_LIB_SPEC \ "%{!static: -ldl} \ - %{pthread:-lc}" + %{pthread: -lc}" #define ANDROID_STARTFILE_SPEC \ "%{!shared:" \ diff --git a/gcc-4.4.3/gcc/config/linux.h b/gcc-4.4.3/gcc/config/linux.h index f2dc836ca..579d50352 100644 --- a/gcc-4.4.3/gcc/config/linux.h +++ b/gcc-4.4.3/gcc/config/linux.h @@ -79,10 +79,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef CPLUSPLUS_CPP_SPEC #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)" -#define LINUX_TARGET_LIB_SPEC \ - "%{pthread:-lpthread} \ - %{shared:-lc} \ +#define LINUX_TARGET_LIB_SPEC_LESS_PTHREAD \ + "%{shared:-lc} \ %{!shared:%{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}}" +#define LINUX_TARGET_LIB_SPEC \ + "%{pthread:-lpthread} " \ + LINUX_TARGET_LIB_SPEC_LESS_PTHREAD #undef LIB_SPEC #define LIB_SPEC LINUX_TARGET_LIB_SPEC diff --git a/gcc-4.4.3/gcc/config/mips/linux.h b/gcc-4.4.3/gcc/config/mips/linux.h index 280d6fbda..136356b26 100644 --- a/gcc-4.4.3/gcc/config/mips/linux.h +++ b/gcc-4.4.3/gcc/config/mips/linux.h @@ -106,12 +106,15 @@ along with GCC; see the file COPYING3. If not see #undef ASM_OUTPUT_REG_POP #undef LINUX_SUBTARGET_LIB_SPEC -#define LINUX_SUBTARGET_LIB_SPEC "\ -%{pthread:-lpthread} \ +#define LINUX_SUBTARGET_LIB_SPEC_LESS_PTHREAD "\ %{shared:-lc} \ %{!shared: \ %{profile:-lc_p} %{!profile:-lc}}" +#define LINUX_SUBTARGET_LIB_SPEC "\ +%{pthread:-lpthread} " \ +LINUX_SUBTARGET_LIB_SPEC_LESS_PTHREAD + #define MD_UNWIND_SUPPORT "config/mips/linux-unwind.h" #ifdef HAVE_AS_NO_SHARED @@ -167,7 +170,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); #undef LIB_SPEC #define LIB_SPEC \ LINUX_OR_ANDROID_LD (LINUX_SUBTARGET_LIB_SPEC, \ - LINUX_SUBTARGET_LIB_SPEC " " ANDROID_LIB_SPEC) + LINUX_SUBTARGET_LIB_SPEC_LESS_PTHREAD " " ANDROID_LIB_SPEC) #undef STARTFILE_SPEC #define STARTFILE_SPEC \ -- cgit v1.2.3