2009-08-14 Steve Ellcey <sje@cup.hp.com>

	* inclhack.def (hpux_imaginary_i): New fix.
	* fixincl.x: Regenerate.
	* tests/base/complex.h: New file.



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

4 files changed, 85 insertions, 5 deletions

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index a093459f31f..edeb1f768af 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* inclhack.def (hpux_imaginary_i): New fix.
+	* fixincl.x: Regenerate.
+	* tests/base/complex.h: New file.
+
 2009-08-12  David Edelsohn  <edelsohn@gnu.org>
 
 	* inclhack.def (aix_complex): New fix.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index a4eb90b6205..b3521e5ffde 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  Saturday August  8, 2009 at 08:07:05 PM EDT
+ * It has been AutoGen-ed  Thursday August 13, 2009 at 08:49:14 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Aug  8 20:07:05 EDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 13 08:49:14 PDT 2009
  *
  * 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 200 fixup descriptions.
+ * This file contains 201 fixup descriptions.
  *
  * See README for more information.
  *
@@ -3969,6 +3969,43 @@ static const char* apzHpux_Inttype_Int8_TPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux_Imaginary_I fix
+ */
+tSCC zHpux_Imaginary_IName[] =
+     "hpux_imaginary_i";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Imaginary_ISelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
+
+#define    HPUX_IMAGINARY_I_TEST_CT  1
+static tTestDesc aHpux_Imaginary_ITests[] = {
+  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Imaginary_I
+ */
+static const char* apzHpux_Imaginary_IPatch[] = {
+    "format",
+    "#  define _Complex_I (__extension__ 1.0iF)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Huge_Val_Hex fix
  */
 tSCC zHuge_Val_HexName[] =
@@ -8128,9 +8165,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          243
+#define REGEX_COUNT          244
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            200
+#define FIX_COUNT            201
 
 /*
  *  Enumerate the fixes
@@ -8232,6 +8269,7 @@ typedef enum {
     HPUX_STDINT_FAST_FIXIDX,
     HPUX_INTTYPE_INT_LEAST8_T_FIXIDX,
     HPUX_INTTYPE_INT8_T_FIXIDX,
+    HPUX_IMAGINARY_I_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -8819,6 +8857,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
 
+  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
+     apzHpux_Imaginary_IMachs,
+     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
      HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 82b767ab927..ba3048661eb 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2131,6 +2131,16 @@ fix = {
     test_text ="typedef char int8_t;\n";
 };
 
+fix = {
+    hackname  = hpux_imaginary_i;
+    mach      = "ia64-hp-hpux11.*";
+    files     = complex.h;
+    select    = "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
+    c_fix     = format;
+    c_fix_arg = "#  define _Complex_I (__extension__ 1.0iF)";
+    test_text = "#  define _Complex_I (0.f+_Imaginary_I)\n";
+};
+
 /*
  *  Fix glibc definition of HUGE_VAL in terms of hex floating point constant
  */
diff --git a/fixincludes/tests/base/complex.h b/fixincludes/tests/base/complex.h
new file mode 100644
index 00000000000..c1447d4f3cd
--- /dev/null
+++ b/fixincludes/tests/base/complex.h
@@ -0,0 +1,21 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/complex.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( AIX_COMPLEX_CHECK )
+#  define _Complex_I (__extension__ 1.0iF)
+#define I _Complex_I
+#endif  /* AIX_COMPLEX_CHECK */
+
+
+#if defined( HPUX_IMAGINARY_I_CHECK )
+#  define _Complex_I (__extension__ 1.0iF)
+
+#endif  /* HPUX_IMAGINARY_I_CHECK */