diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 11 | ||||
| -rw-r--r-- | config/elf.m4 | 2 | ||||
| -rw-r--r-- | config/stdint.m4 | 44 |
3 files changed, 56 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 9593e9a..140e2ce 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,14 @@ +2010-06-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Sync from GCC: + + 2010-04-13 Steve Ellcey <sje@cup.hp.com> + * elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms. + + 2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if + corresponding macros already exist. + 2010-02-15 Nick Clifton <nickc@redhat.com> * elf.m4: Import from gcc mainline. diff --git a/config/elf.m4 b/config/elf.m4 index 44d0249..007006e 100644 --- a/config/elf.m4 +++ b/config/elf.m4 @@ -15,7 +15,7 @@ target_elf=no case $target in *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \ - alpha*-dec-osf* | *-interix*) + alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux*) target_elf=no ;; *) diff --git a/config/stdint.m4 b/config/stdint.m4 index b26b4fc..d63081d 100644 --- a/config/stdint.m4 +++ b/config/stdint.m4 @@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then #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 @@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then #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 @@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then #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 @@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then /* 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 @@ -392,13 +416,17 @@ else #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 @@ -410,24 +438,32 @@ else # 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 */ @@ -440,11 +476,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then /* 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 @@ -496,16 +536,20 @@ 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 |