From 976e44e324f254780ea9b09347ea0e970e40691c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 11 Jun 2008 08:27:04 +0200 Subject: [PATCH] re PR libgomp/36469 (bootstrap broken on HPUX PA) PR libgomp/36469 * configure.ac: Add AC_CHECK_FUNCS (strtoull). * configure: Regenerated. * config.h.in: Regenerated. * env.c (strtoull): Define to strtoul if HAVE_STRTOULL is not defined. From-SVN: r136650 --- libgomp/ChangeLog | 9 +++++++++ libgomp/config.h.in | 3 +++ libgomp/configure | 3 ++- libgomp/configure.ac | 2 +- libgomp/env.c | 3 +++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 92b999fd3c30..ca5d3c0dce54 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2008-06-11 Jakub Jelinek + + PR libgomp/36469 + * configure.ac: Add AC_CHECK_FUNCS (strtoull). + * configure: Regenerated. + * config.h.in: Regenerated. + * env.c (strtoull): Define to strtoul if HAVE_STRTOULL is not + defined. + 2008-06-06 Andreas Tobler PR bootstrap/36452 diff --git a/libgomp/config.h.in b/libgomp/config.h.in index 88a616ca1edd..5f0dcc7570bd 100644 --- a/libgomp/config.h.in +++ b/libgomp/config.h.in @@ -48,6 +48,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL + /* Define to 1 if the target supports __sync_*_compare_and_swap */ #undef HAVE_SYNC_BUILTINS diff --git a/libgomp/configure b/libgomp/configure index f22c8a06c318..038aef5ef36d 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -16624,7 +16624,8 @@ rm -f conftest.err conftest.$ac_objext \ # Check for functions needed. -for ac_func in getloadavg clock_gettime + +for ac_func in getloadavg clock_gettime strtoull do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 12c92340e8cc..21aed2ba8190 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -178,7 +178,7 @@ AC_LINK_IFELSE( [AC_MSG_ERROR([Pthreads are required to build libgomp])])]) # Check for functions needed. -AC_CHECK_FUNCS(getloadavg clock_gettime) +AC_CHECK_FUNCS(getloadavg clock_gettime strtoull) # Check for broken semaphore implementation on darwin. # sem_init returns: sem_init error: Function not implemented. diff --git a/libgomp/env.c b/libgomp/env.c index 022fb1bb0ad9..50872c277fe6 100644 --- a/libgomp/env.c +++ b/libgomp/env.c @@ -47,6 +47,9 @@ #include #include +#ifndef HAVE_STRTOULL +# define strtoull(ptr, eptr, base) strtoul (ptr, eptr, base) +#endif struct gomp_task_icv gomp_global_icv = { .nthreads_var = 1, -- 2.39.2