merge from gcc

This commit is contained in:
DJ Delorie 2010-01-05 21:10:23 +00:00
parent 37f42cc1c8
commit 7fce58cbda
2 changed files with 7 additions and 2 deletions

View File

@ -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> 2009-12-29 Joel Brobecker <brobecker@adacore.com>
* dwarf2.h (enum dwarf_attribute): Add DW_AT_GNAT_descriptive_type. * dwarf2.h (enum dwarf_attribute): Add DW_AT_GNAT_descriptive_type.

View File

@ -1,6 +1,6 @@
/* ANSI and traditional C compatability macros /* ANSI and traditional C compatability macros
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 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. Free Software Foundation, Inc.
This file is part of the GNU C Library. 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 /* inline requires special treatment; it's in C99, and GCC >=2.7 supports
it too, but it's not in C89. */ it too, but it's not in C89. */
#undef inline #undef inline
#if __STDC_VERSION__ > 199901L || defined(__cplusplus) #if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__))
/* it's a keyword */ /* it's a keyword */
#else #else
# if GCC_VERSION >= 2007 # if GCC_VERSION >= 2007