diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-02 12:27:43 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-02 12:27:43 +0000 |
| commit | cd7cbccd5d1da4b465eebed8efbe427ef5f11637 (patch) | |
| tree | a6d6cbce7980b6a1e007f4931f342ecbafccc541 /libgomp | |
| parent | d76c5c3cb20c328bc43d9014897606b09fbd3acd (diff) | |
| download | gcc-cd7cbccd5d1da4b465eebed8efbe427ef5f11637.tar.gz | |
Revert:
2006-07-05 Eric Christopher <echristo@apple.com>
* configure.ac: Depend addition of -pthread on host OS.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121497 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rwxr-xr-x | libgomp/configure | 11 | ||||
| -rw-r--r-- | libgomp/configure.ac | 11 |
3 files changed, 11 insertions, 18 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index cb7e716dee6..e07a91d86c5 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2007-02-02 Jakub Jelinek <jakub@redhat.com> + + Revert: + 2006-07-05 Eric Christopher <echristo@apple.com> + * configure.ac: Depend addition of -pthread on host OS. + * configure: Regenerate. + 2007-01-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * libgomp.texi: Fix spacing after abbreviations. diff --git a/libgomp/configure b/libgomp/configure index 6301eeba4c2..fe7517bbafd 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -8464,8 +8464,7 @@ fi # Check to see if -pthread or -lpthread is needed. Prefer the former. # In case the pthread.h system header is not found, this test will fail. XPCFLAGS="" - -# Darwin doesn't need the -pthread option since threads are in libSystem +CFLAGS="$CFLAGS -pthread" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8504,13 +8503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - case $host in - *-darwin*) - ;; - default) - XPCFLAGS=" -Wc,-pthread" - ;; - esac + XPCFLAGS=" -Wc,-pthread" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 69dd37e7a62..4ee96e2b3dd 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -166,20 +166,13 @@ GCC_HEADER_STDINT(gstdint.h) # Check to see if -pthread or -lpthread is needed. Prefer the former. # In case the pthread.h system header is not found, this test will fail. XPCFLAGS="" - -# Darwin doesn't need the -pthread option since threads are in libSystem +CFLAGS="$CFLAGS -pthread" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [#include <pthread.h> void *g(void *d) { return NULL; }], [pthread_t t; pthread_create(&t,NULL,g,NULL);])], - [case $host in - *-darwin*) - ;; - default) - XPCFLAGS=" -Wc,-pthread" - ;; - esac], + [XPCFLAGS=" -Wc,-pthread"], [CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM( |