| Message ID | 1569826980-110728-1-git-send-email-frederik@codesourcery.com |
|---|---|
| State | New |
| Headers | show |
| Series | libgomp_g.h: Include stdint.h instead of gstdint.h | expand |
On Mon, Sep 30, 2019 at 12:03:00AM -0700, Frederik Harwath wrote: > Hi, > I am a new member of Mentor's Sourcery Tools Services group and this is the first patch that I am submitting here. > I do not have write access to the svn repository yet, hence someone would have to merge this patch for me if it gets accepted. > But I intend to apply for an account soon. > > The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. The inclusion of gstdint.h has been > introduced by GCC trunk r265930, presumably because this introduced uses of uintptr_t. Since gstdint.h is not part of GCC's > installation, several libgomp test cases fail to compile when running the tests with the installed GCC. > > I have tested the patch with "make check" on x86_64 GNU/Linux. That looks wrong, will make libgomp less portable. If anything, it should be something like: #ifndef GCC_GENERATED_STDINT_H #include <stdint.h> #endif so that if gstdint.h is available and has been included by libgomp.h already, it doesn't try to include it. Jakub
Hi Jakub, Am 30.09.2019 um 09:25 schrieb Jakub Jelinek: > On Mon, Sep 30, 2019 at 12:03:00AM -0700, Frederik Harwath wrote: >> The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. [...] > > That looks wrong, will make libgomp less portable. [...] > Jakub We have discussed this issue with Joseph Myers. Let me quote what Joseph wrote: "I think including <stdint.h> is appropriate (and, more generally, removing the special configure support for GCC_HEADER_STDINT for anything built only for the target - note that libgcc/gstdint.h has a comment saying it's about libdecnumber portability to *hosts*, not targets, without stdint.h). On any target without stdint.h, GCC should be providing its own; the only targets where GCC does not yet know about target stdint.h types are SymbianOS, LynxOS, QNX, TPF (see GCC bug 448), and I think it's pretty unlikely libgomp would do anything useful for those (and if in fact they do provide stdint.h, there wouldn't be an issue anyway)." Hence, I think the change will not affect portability negatively. Best regards, Frederik
On Mon, Sep 30, 2019 at 03:42:34PM +0200, Harwath, Frederik wrote: > > Hi Jakub, > > Am 30.09.2019 um 09:25 schrieb Jakub Jelinek: > > On Mon, Sep 30, 2019 at 12:03:00AM -0700, Frederik Harwath wrote: > >> The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. [...] > > > > That looks wrong, will make libgomp less portable. [...] > > Jakub > > We have discussed this issue with Joseph Myers. Let me quote what Joseph > wrote: > > "I think including <stdint.h> is appropriate (and, more generally, > removing the special configure support for GCC_HEADER_STDINT for > anything built only for the target - note that libgcc/gstdint.h has a > comment saying it's about libdecnumber portability to *hosts*, not > targets, without stdint.h). On any target without stdint.h, GCC should > be providing its own; the only targets where GCC does not yet know about > target stdint.h types are SymbianOS, LynxOS, QNX, TPF (see GCC bug 448), > and I think it's pretty unlikely libgomp would do anything useful for > those (and if in fact they do provide stdint.h, there wouldn't be an > issue anyway)." > > Hence, I think the change will not affect portability negatively. Ok for trunk then, I'll test removal of the gstdint.h traces from libgomp as a follow-up. Jakub
On Mon, Sep 30, 2019 at 03:45:51PM +0200, Jakub Jelinek wrote: > > Am 30.09.2019 um 09:25 schrieb Jakub Jelinek: > > > On Mon, Sep 30, 2019 at 12:03:00AM -0700, Frederik Harwath wrote: > > >> The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. [...] > > > > > > That looks wrong, will make libgomp less portable. [...] > > > Jakub > > > > We have discussed this issue with Joseph Myers. Let me quote what Joseph > > wrote: > > > > "I think including <stdint.h> is appropriate (and, more generally, > > removing the special configure support for GCC_HEADER_STDINT for > > anything built only for the target - note that libgcc/gstdint.h has a > > comment saying it's about libdecnumber portability to *hosts*, not > > targets, without stdint.h). On any target without stdint.h, GCC should > > be providing its own; the only targets where GCC does not yet know about > > target stdint.h types are SymbianOS, LynxOS, QNX, TPF (see GCC bug 448), > > and I think it's pretty unlikely libgomp would do anything useful for > > those (and if in fact they do provide stdint.h, there wouldn't be an > > issue anyway)." > > > > Hence, I think the change will not affect portability negatively. > > Ok for trunk then, I'll test removal of the gstdint.h traces from libgomp as a > follow-up. Here is what I'll test on top of your patch. 2019-09-30 Jakub Jelinek <jakub@redhat.com> * configure.ac: Remove GCC_HEADER_STDINT(gstdint.h). * libgomp.h: Include <stdint.h> instead of "gstdint.h". * oacc-parallel.c: Don't include "libgomp_g.h". * plugin/plugin-hsa.c: Include <stdint.h> instead of "gstdint.h". * plugin/plugin-nvptx.c: Don't include "gstdint.h". * aclocal.m4: Regenerated. * config.h.in: Regenerated. * configure: Regenerated. * Makefile.in: Regenerated. --- libgomp/configure.ac.jj 2019-05-30 20:40:50.661683381 +0200 +++ libgomp/configure.ac 2019-09-30 15:46:29.585952622 +0200 @@ -171,8 +171,6 @@ AC_HEADER_TIME ACX_HEADER_STRING AC_CHECK_HEADERS(pthread.h unistd.h semaphore.h sys/loadavg.h sys/sysctl.h sys/time.h) -GCC_HEADER_STDINT(gstdint.h) - XPCFLAGS="" case "$host" in *-*-rtems*) --- libgomp/libgomp.h.jj 2019-09-03 09:42:48.253602133 +0200 +++ libgomp/libgomp.h 2019-09-30 15:49:46.669007187 +0200 @@ -42,7 +42,7 @@ #endif #include "config.h" -#include "gstdint.h" +#include <stdint.h> #include "libgomp-plugin.h" #include "gomp-constants.h" --- libgomp/oacc-parallel.c.jj 2019-06-19 10:04:27.782549120 +0200 +++ libgomp/oacc-parallel.c 2019-09-30 15:52:01.894986975 +0200 @@ -28,7 +28,6 @@ #include "openacc.h" #include "libgomp.h" -#include "libgomp_g.h" #include "gomp-constants.h" #include "oacc-int.h" #ifdef HAVE_INTTYPES_H --- libgomp/plugin/plugin-hsa.c.jj 2019-09-20 12:25:53.260308442 +0200 +++ libgomp/plugin/plugin-hsa.c 2019-09-30 15:52:29.690571715 +0200 @@ -28,7 +28,7 @@ <http://www.gnu.org/licenses/>. */ #include "config.h" -#include "gstdint.h" +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> --- libgomp/plugin/plugin-nvptx.c.jj 2019-05-24 10:59:15.974314095 +0200 +++ libgomp/plugin/plugin-nvptx.c 2019-09-30 15:53:07.609005239 +0200 @@ -34,7 +34,6 @@ #define _GNU_SOURCE #include "openacc.h" #include "config.h" -#include "gstdint.h" #include "libgomp-plugin.h" #include "oacc-plugin.h" #include "gomp-constants.h" --- libgomp/aclocal.m4.jj 2019-05-30 20:40:50.849680298 +0200 +++ libgomp/aclocal.m4 2019-09-30 15:54:06.136130872 +0200 @@ -1176,7 +1176,6 @@ m4_include([../config/lead-dot.m4]) m4_include([../config/lthostflags.m4]) m4_include([../config/multi.m4]) m4_include([../config/override.m4]) -m4_include([../config/stdint.m4]) m4_include([../config/tls.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) --- libgomp/config.h.in.jj 2019-05-23 10:43:19.458316966 +0200 +++ libgomp/config.h.in 2019-09-30 15:46:56.708546877 +0200 @@ -183,21 +183,6 @@ /* Define if all infrastructure, needed for plugins, is supported. */ #undef PLUGIN_SUPPORT -/* The size of `char', as computed by sizeof. */ -#undef SIZEOF_CHAR - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG - -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - -/* The size of `void *', as computed by sizeof. */ -#undef SIZEOF_VOID_P - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS --- libgomp/configure.jj 2019-09-29 13:01:28.512867791 +0200 +++ libgomp/configure 2019-09-30 15:53:31.140653688 +0200 @@ -14916,408 +14916,6 @@ fi done - - -inttype_headers=`echo inttypes.h sys/inttypes.h | sed -e 's/,/ /g'` - -acx_cv_header_stdint=stddef.h -acx_cv_header_stdint_kind="(already complete)" -for i in stdint.h $inttype_headers; do - unset ac_cv_type_uintptr_t - unset ac_cv_type_uintmax_t - unset ac_cv_type_int_least32_t - unset ac_cv_type_int_fast32_t - unset ac_cv_type_uint64_t - $as_echo_n "looking for a compliant stdint.h in $i, " >&6 - ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintmax_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_int_least32_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_int_fast32_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint64_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(lacks uint64_t)" -fi - - break -done -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(lacks uintmax_t)" - for i in stdint.h $inttype_headers; do - unset ac_cv_type_uintptr_t - unset ac_cv_type_uint32_t - unset ac_cv_type_uint64_t - $as_echo_n "looking for an incomplete stdint.h in $i, " >&6 - ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint32_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint64_t" = xyes; then : - -fi - - ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : - -fi - - break - done -fi -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(u_intXX_t style)" - for i in sys/types.h $inttype_headers; do - unset ac_cv_type_u_int32_t - unset ac_cv_type_u_int64_t - $as_echo_n "looking for u_intXX_t types in $i, " >&6 - ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_u_int32_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_u_int64_t" = xyes; then : - -fi - - break - done -fi -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(using manual detection)" -fi - -test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no -test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no -test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no -test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no -test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no - -# ----------------- Summarize what we found so far - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what to include in gstdint.h" >&5 -$as_echo_n "checking what to include in gstdint.h... " >&6; } - -case `$as_basename -- gstdint.h || -$as_expr X/gstdint.h : '.*/\([^/][^/]*\)/*$' \| \ - Xgstdint.h : 'X\(//\)$' \| \ - Xgstdint.h : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/gstdint.h | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` in - stdint.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5 -$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;; - inttypes.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5 -$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;; - *) ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_header_stdint $acx_cv_header_stdint_kind" >&5 -$as_echo "$acx_cv_header_stdint $acx_cv_header_stdint_kind" >&6; } - -# ----------------- done included file, check C basic types -------- - -# Lacking an uintptr_t? Test size of void * -case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in - stddef.h:* | *:no) # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -$as_echo_n "checking size of void *... " >&6; } -if ${ac_cv_sizeof_void_p+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_void_p" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -$as_echo "$ac_cv_sizeof_void_p" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOID_P $ac_cv_sizeof_void_p -_ACEOF - - ;; -esac - -# Lacking an uint64_t? Test size of long -case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in - stddef.h:*:* | *:no:no) # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF - - ;; -esac - -if test $acx_cv_header_stdint = stddef.h; then - # Lacking a good header? Test size of everything and deduce all types. - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF - - - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if ${ac_cv_sizeof_short+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_short=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF - - - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 -$as_echo_n "checking size of char... " >&6; } -if ${ac_cv_sizeof_char+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_char" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (char) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_char=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 -$as_echo "$ac_cv_sizeof_char" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR $ac_cv_sizeof_char -_ACEOF - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int8_t" >&5 -$as_echo_n "checking for type equivalent to int8_t... " >&6; } - case "$ac_cv_sizeof_char" in - 1) acx_cv_type_int8_t=char ;; - *) as_fn_error $? "no 8-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int8_t" >&5 -$as_echo "$acx_cv_type_int8_t" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int16_t" >&5 -$as_echo_n "checking for type equivalent to int16_t... " >&6; } - case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in - 2:*) acx_cv_type_int16_t=int ;; - *:2) acx_cv_type_int16_t=short ;; - *) as_fn_error $? "no 16-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int16_t" >&5 -$as_echo "$acx_cv_type_int16_t" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int32_t" >&5 -$as_echo_n "checking for type equivalent to int32_t... " >&6; } - case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in - 4:*) acx_cv_type_int32_t=int ;; - *:4) acx_cv_type_int32_t=long ;; - *) as_fn_error $? "no 32-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int32_t" >&5 -$as_echo "$acx_cv_type_int32_t" >&6; } -fi - -# These tests are here to make the output prettier - -if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then - case "$ac_cv_sizeof_long" in - 8) acx_cv_type_int64_t=long ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int64_t" >&5 -$as_echo_n "checking for type equivalent to int64_t... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${acx_cv_type_int64_t-'using preprocessor symbols'}" >&5 -$as_echo "${acx_cv_type_int64_t-'using preprocessor symbols'}" >&6; } -fi - -# Now we can use the above types - -if test "$ac_cv_type_uintptr_t" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to intptr_t" >&5 -$as_echo_n "checking for type equivalent to intptr_t... " >&6; } - case $ac_cv_sizeof_void_p in - 2) acx_cv_type_intptr_t=int16_t ;; - 4) acx_cv_type_intptr_t=int32_t ;; - 8) acx_cv_type_intptr_t=int64_t ;; - *) as_fn_error $? "no equivalent for intptr_t, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_intptr_t" >&5 -$as_echo "$acx_cv_type_intptr_t" >&6; } -fi - -# ----------------- done all checks, emit header ------------- -ac_config_commands="$ac_config_commands gstdint.h" - - - - XPCFLAGS="" case "$host" in *-*-rtems*) @@ -18500,24 +18098,6 @@ fi -GCC="$GCC" -CC="$CC" -acx_cv_header_stdint="$acx_cv_header_stdint" -acx_cv_type_int8_t="$acx_cv_type_int8_t" -acx_cv_type_int16_t="$acx_cv_type_int16_t" -acx_cv_type_int32_t="$acx_cv_type_int32_t" -acx_cv_type_int64_t="$acx_cv_type_int64_t" -acx_cv_type_intptr_t="$acx_cv_type_intptr_t" -ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t" -ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t" -ac_cv_type_uint64_t="$ac_cv_type_uint64_t" -ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" -ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t" -ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" -ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" -ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p" - - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -18530,7 +18110,6 @@ do "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gstdint.h" ;; "omp.h") CONFIG_FILES="$CONFIG_FILES omp.h" ;; "omp_lib.h") CONFIG_FILES="$CONFIG_FILES omp_lib.h" ;; "omp_lib.f90") CONFIG_FILES="$CONFIG_FILES omp_lib.f90" ;; @@ -20045,378 +19624,6 @@ compiler_lib_search_path=$lt_compiler_li _LT_EOF ;; - "gstdint.h":C) -if test "$GCC" = yes; then - echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h -else - echo "/* generated for $CC */" > tmp-stdint.h -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - - #ifndef GCC_GENERATED_STDINT_H - #define GCC_GENERATED_STDINT_H 1 - - #include <sys/types.h> -EOF - -if test "$acx_cv_header_stdint" != stdint.h; then - echo "#include <stddef.h>" >> tmp-stdint.h -fi -if test "$acx_cv_header_stdint" != stddef.h; then - echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - /* glibc uses these symbols as guards to prevent redefinitions. */ - #ifdef __int8_t_defined - #define _INT8_T - #define _INT16_T - #define _INT32_T - #endif - #ifdef __uint32_t_defined - #define _UINT32_T - #endif - -EOF - -# ----------------- done header, emit basic int types ------------- -if test "$acx_cv_header_stdint" = stddef.h; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - #ifndef _UINT8_T - #define _UINT8_T - #ifndef __uint8_t_defined - #define __uint8_t_defined - #ifndef uint8_t - typedef unsigned $acx_cv_type_int8_t uint8_t; - #endif - #endif - #endif - - #ifndef _UINT16_T - #define _UINT16_T - #ifndef __uint16_t_defined - #define __uint16_t_defined - #ifndef uint16_t - typedef unsigned $acx_cv_type_int16_t uint16_t; - #endif - #endif - #endif - - #ifndef _UINT32_T - #define _UINT32_T - #ifndef __uint32_t_defined - #define __uint32_t_defined - #ifndef uint32_t - typedef unsigned $acx_cv_type_int32_t uint32_t; - #endif - #endif - #endif - - #ifndef _INT8_T - #define _INT8_T - #ifndef __int8_t_defined - #define __int8_t_defined - #ifndef int8_t - typedef $acx_cv_type_int8_t int8_t; - #endif - #endif - #endif - - #ifndef _INT16_T - #define _INT16_T - #ifndef __int16_t_defined - #define __int16_t_defined - #ifndef int16_t - typedef $acx_cv_type_int16_t int16_t; - #endif - #endif - #endif - - #ifndef _INT32_T - #define _INT32_T - #ifndef __int32_t_defined - #define __int32_t_defined - #ifndef int32_t - typedef $acx_cv_type_int32_t int32_t; - #endif - #endif - #endif -EOF -elif test "$ac_cv_type_u_int32_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */ - #ifndef _INT8_T - #define _INT8_T - #endif - #ifndef _INT16_T - #define _INT16_T - #endif - #ifndef _INT32_T - #define _INT32_T - #endif - - #ifndef _UINT8_T - #define _UINT8_T - #ifndef __uint8_t_defined - #define __uint8_t_defined - #ifndef uint8_t - typedef u_int8_t uint8_t; - #endif - #endif - #endif - - #ifndef _UINT16_T - #define _UINT16_T - #ifndef __uint16_t_defined - #define __uint16_t_defined - #ifndef uint16_t - typedef u_int16_t uint16_t; - #endif - #endif - #endif - - #ifndef _UINT32_T - #define _UINT32_T - #ifndef __uint32_t_defined - #define __uint32_t_defined - #ifndef uint32_t - typedef u_int32_t uint32_t; - #endif - #endif - #endif -EOF -else - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Some systems have guard macros to prevent redefinitions, define them. */ - #ifndef _INT8_T - #define _INT8_T - #endif - #ifndef _INT16_T - #define _INT16_T - #endif - #ifndef _INT32_T - #define _INT32_T - #endif - #ifndef _UINT8_T - #define _UINT8_T - #endif - #ifndef _UINT16_T - #define _UINT16_T - #endif - #ifndef _UINT32_T - #define _UINT32_T - #endif -EOF -fi - -# ------------- done basic int types, emit int64_t types ------------ -if test "$ac_cv_type_uint64_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* system headers have good uint64_t and int64_t */ - #ifndef _INT64_T - #define _INT64_T - #endif - #ifndef _UINT64_T - #define _UINT64_T - #endif -EOF -elif test "$ac_cv_type_u_int64_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* system headers have an u_int64_t (and int64_t) */ - #ifndef _INT64_T - #define _INT64_T - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef __uint64_t_defined - #define __uint64_t_defined - #ifndef uint64_t - typedef u_int64_t uint64_t; - #endif - #endif - #endif -EOF -elif test -n "$acx_cv_type_int64_t"; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* architecture has a 64-bit type, $acx_cv_type_int64_t */ - #ifndef _INT64_T - #define _INT64_T - #ifndef int64_t - typedef $acx_cv_type_int64_t int64_t; - #endif - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef __uint64_t_defined - #define __uint64_t_defined - #ifndef uint64_t - typedef unsigned $acx_cv_type_int64_t uint64_t; - #endif - #endif - #endif -EOF -else - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* some common heuristics for int64_t, using compiler-specific tests */ - #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L - #ifndef _INT64_T - #define _INT64_T - #ifndef __int64_t_defined - #ifndef int64_t - typedef long long int64_t; - #endif - #endif - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef uint64_t - typedef unsigned long long uint64_t; - #endif - #endif - - #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 - /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and - does not implement __extension__. But that compiler doesn't define - __GNUC_MINOR__. */ - # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) - # define __extension__ - # endif - - # ifndef _INT64_T - # define _INT64_T - # ifndef int64_t - __extension__ typedef long long int64_t; - # endif - # endif - # ifndef _UINT64_T - # define _UINT64_T - # ifndef uint64_t - __extension__ typedef unsigned long long uint64_t; - # endif - # endif - - #elif !defined __STRICT_ANSI__ - # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ - - # ifndef _INT64_T - # define _INT64_T - # ifndef int64_t - typedef __int64 int64_t; - # endif - # endif - # ifndef _UINT64_T - # define _UINT64_T - # ifndef uint64_t - typedef unsigned __int64 uint64_t; - # endif - # endif - # endif /* compiler */ - - #endif /* ANSI version */ -EOF -fi - -# ------------- done int64_t types, emit intptr types ------------ -if test "$ac_cv_type_uintptr_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ - #ifndef __uintptr_t_defined - #ifndef uintptr_t - typedef u$acx_cv_type_intptr_t uintptr_t; - #endif - #endif - #ifndef __intptr_t_defined - #ifndef intptr_t - typedef $acx_cv_type_intptr_t intptr_t; - #endif - #endif -EOF -fi - -# ------------- done intptr types, emit int_least types ------------ -if test "$ac_cv_type_int_least32_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define int_least types */ - typedef int8_t int_least8_t; - typedef int16_t int_least16_t; - typedef int32_t int_least32_t; - #ifdef _INT64_T - typedef int64_t int_least64_t; - #endif - - typedef uint8_t uint_least8_t; - typedef uint16_t uint_least16_t; - typedef uint32_t uint_least32_t; - #ifdef _UINT64_T - typedef uint64_t uint_least64_t; - #endif -EOF -fi - -# ------------- done intptr types, emit int_fast types ------------ -if test "$ac_cv_type_int_fast32_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define int_fast types. short is often slow */ - typedef int8_t int_fast8_t; - typedef int int_fast16_t; - typedef int32_t int_fast32_t; - #ifdef _INT64_T - typedef int64_t int_fast64_t; - #endif - - typedef uint8_t uint_fast8_t; - typedef unsigned int uint_fast16_t; - typedef uint32_t uint_fast32_t; - #ifdef _UINT64_T - typedef uint64_t uint_fast64_t; - #endif -EOF -fi - -if test "$ac_cv_type_uintmax_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define intmax based on what we found */ - #ifndef intmax_t - #ifdef _INT64_T - typedef int64_t intmax_t; - #else - typedef long intmax_t; - #endif - #endif - #ifndef uintmax_t - #ifdef _UINT64_T - typedef uint64_t uintmax_t; - #else - typedef unsigned long uintmax_t; - #endif - #endif -EOF -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - - #endif /* GCC_GENERATED_STDINT_H */ -EOF - -if test -r gstdint.h && cmp -s tmp-stdint.h gstdint.h; then - rm -f tmp-stdint.h -else - mv -f tmp-stdint.h gstdint.h -fi - - ;; esac done # for ac_tag --- libgomp/Makefile.in.jj 2019-05-30 20:40:50.660683397 +0200 +++ libgomp/Makefile.in 2019-09-30 15:50:34.627290715 +0200 @@ -132,7 +132,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../c $(top_srcdir)/../config/lthostflags.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../config/stdint.m4 \ $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ Jakub
Hi! On 2019-09-30T00:03:00-0700, Frederik Harwath <frederik@codesourcery.com> wrote: > The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. The inclusion of gstdint.h has been > introduced by GCC trunk r265930, presumably because this introduced uses of uintptr_t. Since gstdint.h is not part of GCC's > installation, several libgomp test cases fail to compile when running the tests with the installed GCC. This got into Subversion trunk in time for GCC 10, but is also necessary for GCC 9; I've thus just pushed to releases/gcc-9 branch "libgomp_g.h: Include stdint.h instead of gstdint.h" in commit 8d491db06a606f45d7c46e219fc075a3fea22e32, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
diff --git a/libgomp/libgomp_g.h b/libgomp/libgomp_g.h index 32a9d8a..dfb55fb 100644 --- a/libgomp/libgomp_g.h +++ b/libgomp/libgomp_g.h @@ -31,7 +31,7 @@ #include <stdbool.h> #include <stddef.h> -#include "gstdint.h" +#include <stdint.h> /* barrier.c */
Hi, I am a new member of Mentor's Sourcery Tools Services group and this is the first patch that I am submitting here. I do not have write access to the svn repository yet, hence someone would have to merge this patch for me if it gets accepted. But I intend to apply for an account soon. The patch changes libgomp/libgomp_g.h to include stdint.h instead of the internal gstdint.h. The inclusion of gstdint.h has been introduced by GCC trunk r265930, presumably because this introduced uses of uintptr_t. Since gstdint.h is not part of GCC's installation, several libgomp test cases fail to compile when running the tests with the installed GCC. I have tested the patch with "make check" on x86_64 GNU/Linux. Best regards, Frederik libgomp/ChangeLog: 2019-09-25 Kwok Cheung Yeung <kcy@codesourcery.com> * libgomp_g.h: Include stdint.h instead of gstdint.h.