gcc:

	* config.gcc (mips-sgi-irix[56]*): Set use_gcc_stdint.
	* config/mips/iris.h (INT8_TYPE, INT16_TYPE, INT32_TYPE,
	INT64_TYPE): Define.
	(UINT8_TYPE, UINT16_TYPE, UINT32_TYPE, UINT64_TYPE): Define.
	(INT_LEAST8_TYPE, INT_LEAST16_TYPE, INT_LEAST32_TYPE,
	INT_LEAST64_TYPE): Define.
	(UINT_LEAST8_TYPE, UINT_LEAST16_TYPE, UINT_LEAST32_TYPE,
	UINT_LEAST64_TYPE): Define.
	(INT_FAST8_TYPE, INT_FAST16_TYPE, INT_FAST32_TYPE)
	INT_FAST64_TYPE): Define.
	(UINT_FAST8_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE,
	UINT_FAST64_TYPE): Define.
	(INTMAX_TYPE, UINTMAX_TYPE): Define.
	(INTPTR_TYPE, UINTPTR_TYPE): Define.
	(SIG_ATOMIC_TYPE): Define.

	fixincludes:
	* inclhack.def (aix_stdint_1): Add stdint-aix.h to files.
	(aix_stdint_2): Likewise.
	(aix_stdint_3): Likewise.
	(aix_stdint_4): Likewise.
	(aix_stdint_5): Likewise.
	(darwin_stdint_1): Add stdint-darwin.h to files.
	(darwin_stdint_2): Likewise.
	(darwin_stdint_3): Likewise.
	(darwin_stdint_4): Likewise.
	(darwin_stdint_5): Likewise.
	(darwin_stdint_6): Likewise.
	(darwin_stdint_7): Likewise.
	(hpux_c99_intptr): Add stdint-hpux11.h to files.
	(hpux_c99_inttypes): Likewise.
	(hpux_c99_inttypes2): Likewise.
	(hpux_stdint_least_fast): Likewise.
	(irix_stdint_c99): Renamed to irix_stdint_c99_mode.
	(irix_stdint_c99_types): New fix.
	(irix_stdint_c99_macros): New fix.
	(newlib_stdint_1): Add stdint-newlib.h to files.
	(newlib_stdint_2): Likewise.
	fixincl.x: Regenerate.
	tests/base/stdint-aix.h: New file.
	tests/base/stdint.h [AIX_STDINT_1_CHECK, AIX_STDINT_2_CHECK,
	AIX_STDINT_3_CHECK, AIX_STDINT_4_CHECK, AIX_STDINT_5_CHECK]: Moved ...
	tests/base/stdint-aix.h: ... here.
	[AIX_STDINT_3_CHECK]: Updated to match aix_stdint_3 fix.
	[AIX_STDINT_4_CHECK]: Updated to match aix_stdint_4 fix.
	[AIX_STDINT_5_CHECK]: Updated to match aix_stdint_5 fix.
	tests/base/stdint-darwin.h: New file.
	tests/base/stdint.h [DARWIN_STDINT_1_CHECK, DARWIN_STDINT_2_CHECK,
	DARWIN_STDINT_3_CHECK, DARWIN_STDINT_4_CHECK,
	DARWIN_STDINT_5_CHECK, DARWIN_STDINT_6_CHECK]: Moved ...
	tests/base/stdint-darwin.h: ... here.
	[DARWIN_STDINT_1_CHECK]: Updated to match darwin_stdint_1 fix.
	[DARWIN_STDINT_4_CHECK]: Updated to match darwin_stdint_4 fix.
	[DARWIN_STDINT_6_CHECK]: Updated to match darwin_stdint_6 fix.
	tests/base/stdint-hpux11.h: New file.
	tests/base/stdint.h [HPUX_C99_INTPTR_CHECK,
	HPUX_C99_INTTYPES2_CHECK, HPUX_STDINT_LEAST_FAST_CHECK]: Moved ...
	tests/base/stdint-hpux11.h: ... here.
	[HPUX_C99_INTPTR_CHECK]: Updated to match hpux_c99_intptr fix.
	[HPUX_C99_INTTYPES2_CHECK]: Updated to match hpux_c99_inttypes2 fix.
	tests/base/stdint.h [IRIX_STDINT_C99_CHECK]: Renamed guard to
	IRIX_STDINT_C99_MODE_CHECK.
	tests/base/stdint-irix65.h: New file.
	tests/base/stdint-newlib.h: New file.
	tests/base/stdint.h [NEWLIB_STDINT_1_CHECK,
	NEWLIB_STDINT_2_CHECK]: Moved ...
	tests/base/stdint-newlib.h: ... here.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156259 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 127 insertions, 38 deletions

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 2d6e1fcd9cf..907df7d1eb8 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Tuesday October 20, 2009 at 04:21:49 PM PDT
+ * It has been AutoGen-ed  Tuesday January 26, 2010 at 08:17:12 PM MET
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 20 16:21:49 PDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jan 26 20:17:12 MET 2010
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 202 fixup descriptions.
+ * This file contains 204 fixup descriptions.
  *
  * See README for more information.
  *
@@ -568,7 +568,7 @@ tSCC zAix_Stdint_1Name[] =
  *  File name selection pattern
  */
 tSCC zAix_Stdint_1List[] =
-  "stdint.h\0";
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -607,7 +607,7 @@ tSCC zAix_Stdint_2Name[] =
  *  File name selection pattern
  */
 tSCC zAix_Stdint_2List[] =
-  "stdint.h\0";
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -656,7 +656,7 @@ tSCC zAix_Stdint_3Name[] =
  *  File name selection pattern
  */
 tSCC zAix_Stdint_3List[] =
-  "stdint.h\0";
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -701,7 +701,7 @@ tSCC zAix_Stdint_4Name[] =
  *  File name selection pattern
  */
 tSCC zAix_Stdint_4List[] =
-  "stdint.h\0";
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -742,7 +742,7 @@ tSCC zAix_Stdint_5Name[] =
  *  File name selection pattern
  */
 tSCC zAix_Stdint_5List[] =
-  "stdint.h\0";
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2046,7 +2046,7 @@ tSCC zDarwin_Stdint_1Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_1List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2085,7 +2085,7 @@ tSCC zDarwin_Stdint_2Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_2List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2134,7 +2134,7 @@ tSCC zDarwin_Stdint_3Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_3List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2179,7 +2179,7 @@ tSCC zDarwin_Stdint_4Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_4List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2224,7 +2224,7 @@ tSCC zDarwin_Stdint_5Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_5List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2271,7 +2271,7 @@ tSCC zDarwin_Stdint_6Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_6List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2320,7 +2320,7 @@ tSCC zDarwin_Stdint_7Name[] =
  *  File name selection pattern
  */
 tSCC zDarwin_Stdint_7List[] =
-  "stdint.h\0";
+  "stdint-darwin.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3964,7 +3964,7 @@ tSCC zHpux_C99_IntptrName[] =
  *  File name selection pattern
  */
 tSCC zHpux_C99_IntptrList[] =
-  "stdint.h\0";
+  "stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3997,7 +3997,7 @@ tSCC zHpux_C99_InttypesName[] =
  *  File name selection pattern
  */
 tSCC zHpux_C99_InttypesList[] =
-  "inttypes.h\0stdint.h\0";
+  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4028,7 +4028,7 @@ tSCC zHpux_C99_Inttypes2Name[] =
  *  File name selection pattern
  */
 tSCC zHpux_C99_Inttypes2List[] =
-  "stdint.h\0";
+  "stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4059,7 +4059,7 @@ tSCC zHpux_Stdint_Least_FastName[] =
  *  File name selection pattern
  */
 tSCC zHpux_Stdint_Least_FastList[] =
-  "stdint.h\0";
+  "stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4705,38 +4705,38 @@ typedef int socklen_t;\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99 fix
+ *  Description of Irix_Stdint_C99_Mode fix
  */
-tSCC zIrix_Stdint_C99Name[] =
-     "irix_stdint_c99";
+tSCC zIrix_Stdint_C99_ModeName[] =
+     "irix_stdint_c99_mode";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99List[] =
+tSCC zIrix_Stdint_C99_ModeList[] =
   "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99Machs[] = {
+tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
         "mips-sgi-irix6.5",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdint_C99Select0[] =
+tSCC zIrix_Stdint_C99_ModeSelect0[] =
        "(#ifndef __c99\n\
 )(#error This header file is to be used only for c99 mode compilations)";
 
-#define    IRIX_STDINT_C99_TEST_CT  1
-static tTestDesc aIrix_Stdint_C99Tests[] = {
-  { TT_EGREP,    zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
+#define    IRIX_STDINT_C99_MODE_TEST_CT  1
+static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
+  { TT_EGREP,    zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99
+ *  Fix Command Arguments for Irix_Stdint_C99_Mode
  */
-static const char* apzIrix_Stdint_C99Patch[] = {
+static const char* apzIrix_Stdint_C99_ModePatch[] = {
     "format",
     "#if 0\n\
 %2",
@@ -4744,6 +4744,83 @@ static const char* apzIrix_Stdint_C99Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Stdint_C99_Types fix
+ */
+tSCC zIrix_Stdint_C99_TypesName[] =
+     "irix_stdint_c99_types";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_TypesList[] =
+  "stdint-irix65.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+#define IRIX_STDINT_C99_TYPES_TEST_CT  0
+#define aIrix_Stdint_C99_TypesTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Irix_Stdint_C99_Types
+ */
+static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
+    "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN               (-0x7fffffffffffffffLL - 1)@",
+    "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX               0x7fffffffffffffffLL@",
+    "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX              0xffffffffU@",
+    "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX              0xffffffffffffffffULL@",
+    "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN              (-0x7fffffffL - 1)@",
+    "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX              0x7fffffffL@",
+    "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX             0xffffffffUL@",
+    "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN              (-0x7fffffffffffffffL - 1)@",
+    "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX              0x7fffffffffffffffL@",
+    "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX             0xffffffffffffffffUL@",
+    "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN             (-0x7fffffffffffffffL - 1)@",
+    "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX             0x7fffffffffffffffL@",
+    "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX                0xffffffffffffffffUL@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Stdint_C99_Macros fix
+ */
+tSCC zIrix_Stdint_C99_MacrosName[] =
+     "irix_stdint_c99_macros";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_MacrosList[] =
+  "stdint-irix65.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+#define IRIX_STDINT_C99_MACROS_TEST_CT  0
+#define aIrix_Stdint_C99_MacrosTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Irix_Stdint_C99_Macros
+ */
+static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
+    "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x)               (x)@",
+    "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x)              (x)@",
+    "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x)              (x)@",
+    "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x)              (x ## LL)@",
+    "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x)              (x)@",
+    "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x)             (x)@",
+    "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x)             (x ## U)@",
+    "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x)             (x ## ULL)@",
+    "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x)             (x ## LL)@",
+    "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x)            (x ## ULL)@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Stdio_Va_List fix
  */
 tSCC zIrix_Stdio_Va_ListName[] =
@@ -5300,7 +5377,7 @@ tSCC zNewlib_Stdint_1Name[] =
  *  File name selection pattern
  */
 tSCC zNewlib_Stdint_1List[] =
-  "stdint.h\0";
+  "stdint-newlib.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -5347,7 +5424,7 @@ tSCC zNewlib_Stdint_2Name[] =
  *  File name selection pattern
  */
 tSCC zNewlib_Stdint_2List[] =
-  "stdint.h\0";
+  "stdint-newlib.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -8241,7 +8318,7 @@ static const char* apzX11_SprintfPatch[] = {
  */
 #define REGEX_COUNT          244
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            202
+#define FIX_COUNT            204
 
 /*
  *  Enumerate the fixes
@@ -8361,7 +8438,9 @@ typedef enum {
     IRIX_COMPLEX_FIXIDX,
     IRIX_LIMITS_CONST_FIXIDX,
     IRIX_SOCKLEN_T_FIXIDX,
-    IRIX_STDINT_C99_FIXIDX,
+    IRIX_STDINT_C99_MODE_FIXIDX,
+    IRIX_STDINT_C99_TYPES_FIXIDX,
+    IRIX_STDINT_C99_MACROS_FIXIDX,
     IRIX_STDIO_VA_LIST_FIXIDX,
     IRIX_WCSFTIME_FIXIDX,
     KANDR_CONCAT_FIXIDX,
@@ -9022,10 +9101,20 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Socklen_TTests,   apzIrix_Socklen_TPatch, 0 },
 
-  {  zIrix_Stdint_C99Name,    zIrix_Stdint_C99List,
-     apzIrix_Stdint_C99Machs,
-     IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Stdint_C99Tests,   apzIrix_Stdint_C99Patch, 0 },
+  {  zIrix_Stdint_C99_ModeName,    zIrix_Stdint_C99_ModeList,
+     apzIrix_Stdint_C99_ModeMachs,
+     IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Stdint_C99_ModeTests,   apzIrix_Stdint_C99_ModePatch, 0 },
+
+  {  zIrix_Stdint_C99_TypesName,    zIrix_Stdint_C99_TypesList,
+     apzIrix_Stdint_C99_TypesMachs,
+     IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
+     aIrix_Stdint_C99_TypesTests,   apzIrix_Stdint_C99_TypesPatch, 0 },
+
+  {  zIrix_Stdint_C99_MacrosName,    zIrix_Stdint_C99_MacrosList,
+     apzIrix_Stdint_C99_MacrosMachs,
+     IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
+     aIrix_Stdint_C99_MacrosTests,   apzIrix_Stdint_C99_MacrosPatch, 0 },
 
   {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
      apzIrix_Stdio_Va_ListMachs,