diff options
Diffstat (limited to 'gcc-4.9/libcilkrts/configure')
| -rw-r--r-- | gcc-4.9/libcilkrts/configure | 58 |
1 files changed, 55 insertions, 3 deletions
diff --git a/gcc-4.9/libcilkrts/configure b/gcc-4.9/libcilkrts/configure index 63181d78b..0dadbbda0 100644 --- a/gcc-4.9/libcilkrts/configure +++ b/gcc-4.9/libcilkrts/configure @@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +link_cilkrts lt_cv_dlopen_libs toolexeclibdir toolexecdir @@ -4214,7 +4215,7 @@ fi # AC_PROG_LIBTOOL # AC_CONFIG_MACRO_DIR([..]) -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile libcilkrts.spec" # Default to --enable-multilib # Check whether --enable-multilib was given. @@ -11056,7 +11057,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11059 "configure" +#line 11060 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11162,7 +11163,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11165 "configure" +#line 11166 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14451,6 +14452,56 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +# Check to see if -pthread or -lpthread is needed. Prefer the former. +# Note that the CILK_SELF_SPEC in gcc.c may force -pthread. +# In case the pthread.h system header is not found, this test will fail. +CFLAGS="$CFLAGS -pthread" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <pthread.h> + void *g(void *d) { return NULL; } +int +main () +{ +pthread_t t; pthread_create(&t,NULL,g,NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +else + CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <pthread.h> + void *g(void *d) { return NULL; } +int +main () +{ +pthread_t t; pthread_create(&t,NULL,g,NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +else + as_fn_error "Pthreads are required to build libcilkrts" "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +if test $enable_shared = yes; then + link_cilkrts="-lcilkrts %{static: $LIBS}" +else + link_cilkrts="-lcilkrts $LIBS" +fi + + # Must be last cat >confcache <<\_ACEOF @@ -15567,6 +15618,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "libcilkrts.spec") CONFIG_FILES="$CONFIG_FILES libcilkrts.spec" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |