PR testsuite/31828

	* inclhack.def (hppa_hpux_fp_macros): New.
	* fixincl.x: Regenerate.
	* * tests/base/math.h: Update.

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

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 69acbf4..a51e22d 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-06  Steve Ellcey  <sje@cup.hp.com>
+
+       PR testsuite/31828
+       * inclhack.def (hppa_hpux_fp_macros): New.
+       * fixincl.x: Regenerate.
+       * tests/base/math.h: Update.
+
 2007-03-26  Jakub Jelinek  <jakub@redhat.com>
 
        * inclhack.def (glibc_c99_inline_1): Define __USE_EXTERN_INLINES

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 5239cbf..3aeba91 100644 (file)
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Wednesday March 21, 2007 at 05:39:23 PM CET
+ * It has been AutoGen-ed  Tuesday June  5, 2007 at 02:48:40 PM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 21 17:39:23 CET 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jun  5 14:48:40 PDT 2007
  *
  * 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 208 fixup descriptions.
+ * This file contains 209 fixup descriptions.
  *
  * See README for more information.
  *
@@ -2587,6 +2587,50 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hppa_Hpux_Fp_Macros fix
+ */
+tSCC zHppa_Hpux_Fp_MacrosName[] =
+     "hppa_hpux_fp_macros";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHppa_Hpux_Fp_MacrosList[] =
+  "math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
+        "hppa*-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
+       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
+#[ \t]*define[ \t]*FP_ZERO.*\n\
+#[ \t]*define[ \t]*FP_INFINITE.*\n\
+#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
+#[ \t]*define[ \t]*FP_NAN.*\n";
+
+#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
+static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
+  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
+ */
+static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
+    "format",
+    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
+#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
+%0#endif\n\n\
+#ifdef _INCLUDE_HPUX_SOURCE\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux10_Ctype_Declarations1 fix
  */
 tSCC zHpux10_Ctype_Declarations1Name[] =
@@ -8474,9 +8518,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          253
+#define REGEX_COUNT          254
 #define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            208
+#define FIX_COUNT            209
 
 /*
  *  Enumerate the fixes
@@ -8542,6 +8586,7 @@ typedef enum {
     HP_SYSFILE_FIXIDX,
     HPUX10_CPP_POW_INLINE_FIXIDX,
     HPUX11_CPP_POW_INLINE_FIXIDX,
+    HPPA_HPUX_FP_MACROS_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
@@ -8993,6 +9038,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
 
+  {  zHppa_Hpux_Fp_MacrosName,    zHppa_Hpux_Fp_MacrosList,
+     apzHppa_Hpux_Fp_MacrosMachs,
+     HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHppa_Hpux_Fp_MacrosTests,   apzHppa_Hpux_Fp_MacrosPatch, 0 },
+
   {  zHpux10_Ctype_Declarations1Name,    zHpux10_Ctype_Declarations1List,
      apzHpux10_Ctype_Declarations1Machs,
      HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index b8a4458..dbdabb2 100644 (file)
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1558,6 +1558,27 @@ fix = {
 };
 
 
+fix = {
+     hackname  = hppa_hpux_fp_macros;
+     mach      = hppa*-hp-hpux11*;
+     files     = math.h;
+     select    = "#[ \t]*define[ \t]*FP_NORMAL.*\n"
+                "#[ \t]*define[ \t]*FP_ZERO.*\n"
+                "#[ \t]*define[ \t]*FP_INFINITE.*\n"
+                "#[ \t]*define[ \t]*FP_SUBNORMAL.*\n"
+                "#[ \t]*define[ \t]*FP_NAN.*\n";
+     c_fix     = format;
+     c_fix_arg = "#endif /* _INCLUDE_HPUX_SOURCE */\n\n#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n%0#endif\n\n#ifdef _INCLUDE_HPUX_SOURCE\n";
+
+     test_text =
+            "#  define FP_NORMAL     0\n"
+            "#  define FP_ZERO       1\n"
+            "#  define FP_INFINITE   2\n"
+            "#  define FP_SUBNORMAL  3\n"
+            "#  define FP_NAN        4\n";
+};
+
+
 /*
  *  Fix hpux 10.X missing ctype declarations 1
  */

diff --git a/fixincludes/tests/base/math.h b/fixincludes/tests/base/math.h
index 6b6ae09..2f6547d 100644 (file)
--- a/fixincludes/tests/base/math.h
+++ b/fixincludes/tests/base/math.h
@@ -48,6 +48,22 @@ extern int matherr();
 #endif  /* HPUX11_CPP_POW_INLINE_CHECK */
 
 
+#if defined( HPPA_HPUX_FP_MACROS_CHECK )
+#endif /* _INCLUDE_HPUX_SOURCE */
+
+#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))
+#  define FP_NORMAL     0
+#  define FP_ZERO       1
+#  define FP_INFINITE   2
+#  define FP_SUBNORMAL  3
+#  define FP_NAN        4
+#endif
+
+#ifdef _INCLUDE_HPUX_SOURCE
+
+#endif  /* HPPA_HPUX_FP_MACROS_CHECK */
+
+
 #if defined( HPUX11_FABSF_CHECK )
 #ifdef _PA_RISC
 #ifndef __cplusplus