OSDN Git Service

add fixes for new hp/ux patch
authorkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 5 Oct 2002 18:21:59 +0000 (18:21 +0000)
committerkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 5 Oct 2002 18:21:59 +0000 (18:21 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57845 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/fixinc/fixincl.x
gcc/fixinc/inclhack.def
gcc/fixinc/tests/base/stdlib.h

index c0686d4..c8b988f 100644 (file)
@@ -1,3 +1,9 @@
+2002-10-04  Bruce Korb  <bkorb@gnu.org>
+
+       * fixinc/inclhack.def(hpux11_abs):  use format fix
+       * fixinc/fixincl.x: regenerate
+       * fixinc/tests/base/stdlib.h: accommodate new fix test
+
 Sat Oct  5 19:42:45 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * c-common.c (cb_register_builtins):  Use really_no_inline.
index 4a30936..a17fa9b 100644 (file)
@@ -1942,8 +1942,9 @@ static tTestDesc aHpux11_AbsTests[] = {
 /*
  *  Fix Command Arguments for Hpux11_Abs
  */
-static const char* apzHpux11_AbsPatch[] = { "sed",
-    "-e", "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/",
+static const char* apzHpux11_AbsPatch[] = {
+    "format",
+    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6134,7 +6135,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zHpux11_AbsName,    zHpux11_AbsList,
      apzHpux11_AbsMachs,
-     HPUX11_ABS_TEST_CT, FD_MACH_ONLY,
+     HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
 
   {  zHpux11_Size_TName,    zHpux11_Size_TList,
index 12fc234..787bcb7 100644 (file)
@@ -1172,7 +1172,9 @@ fix = {
     mach      = ia64-hp-hpux11*;
     files     = stdlib.h;
     select    = "ifndef _MATH_INCLUDED";
-    sed       = "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/";
+    c_fix     = format;
+    c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)";
+//  sed       = "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/";
     test_text = "#ifndef _MATH_INCLUDED";
 };
 
index 9e43d13..857989c 100644 (file)
 #endif  /* ARM_WCHAR_CHECK */
 
 
+#if defined( HPUX11_ABS_CHECK )
+#if !defined(_MATH_INCLUDED) || defined(__GNUG__)
+#endif  /* HPUX11_ABS_CHECK */
+
+
 #if defined( INT_ABORT_FREE_AND_EXIT_CHECK )
 extern void    abort(int);
 extern void    free(void*);