diff options
| author | DJ Delorie <dj@redhat.com> | 2010-01-05 21:10:30 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-01-05 21:10:30 +0000 |
| commit | 43e85a8f541dcc299092452d816749cf99e31d60 (patch) | |
| tree | 13a07425783335abf7d668da97ba93920894dcfb | |
| parent | ce6cca6d61556fecbabbca20f49e8e76545b6bc6 (diff) | |
| download | binutils-43e85a8f541dcc299092452d816749cf99e31d60.zip binutils-43e85a8f541dcc299092452d816749cf99e31d60.tar.gz binutils-43e85a8f541dcc299092452d816749cf99e31d60.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/ansidecl.h | 4 | ||||
| -rw-r--r-- | libdecnumber/ChangeLog | 4 | ||||
| -rwxr-xr-x | libdecnumber/configure | 44 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rwxr-xr-x | libiberty/configure | 1 | ||||
| -rw-r--r-- | libiberty/configure.ac | 1 |
7 files changed, 63 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index cd2b1a7..7e242a2 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/41771 + * ansidecl.h: Fix inline test for C99 and Sun Studio cc. + 2009-12-29 Joel Brobecker <brobecker@adacore.com> * dwarf2.h (enum dwarf_attribute): Add DW_AT_GNAT_descriptive_type. diff --git a/include/ansidecl.h b/include/ansidecl.h index 86b0944..8b76647 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -1,6 +1,6 @@ /* ANSI and traditional C compatability macros Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2009 + 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -178,7 +178,7 @@ So instead we use the macro below and test it against specific values. */ /* inline requires special treatment; it's in C99, and GCC >=2.7 supports it too, but it's not in C89. */ #undef inline -#if __STDC_VERSION__ > 199901L || defined(__cplusplus) +#if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__)) /* it's a keyword */ #else # if GCC_VERSION >= 2007 diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index 88df3a4..b218e42 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,7 @@ +2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure: Regenerate. + 2009-11-28 Jakub Jelinek <jakub@redhat.com> * decContext.c (decContextTestEndian): Move adj definition into diff --git a/libdecnumber/configure b/libdecnumber/configure index 75a7b90..f621fc7 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -6162,49 +6162,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 @@ -6224,25 +6236,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 @@ -6292,9 +6310,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 @@ -6302,15 +6322,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 @@ -6320,13 +6344,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 @@ -6338,24 +6366,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 */ @@ -6368,11 +6404,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 @@ -6422,16 +6462,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 diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index f8ba8f7..c3d8f19 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2010-01-04 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> + + PR target/42316 + * configure.ac (PICFLAG): Use -fPIC on SH hosts. + * configure: Regenerate. + 2009-12-07 Doug Evans <dje@google.com> * pex-unix.c (pex_unix_exec_child): Save/restore environ. diff --git a/libiberty/configure b/libiberty/configure index 6a3f602..77aeb56 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -4860,6 +4860,7 @@ if [ "${shared}" = "yes" ]; then * ) PICFLAG=-fPIC ;; esac ;; s390*-*-*) PICFLAG=-fpic ;; + sh*-*-*) PICFLAG=-fPIC ;; esac fi diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 6da7ea0..515bb33 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -217,6 +217,7 @@ if [[ "${shared}" = "yes" ]]; then * ) PICFLAG=-fPIC ;; esac ;; s390*-*-*) PICFLAG=-fpic ;; + sh*-*-*) PICFLAG=-fPIC ;; esac fi AC_SUBST(PICFLAG) |