From d758c1db6bad001b7ff82cf36d075de21fa75e05 Mon Sep 17 00:00:00 2001
From: Bruce Korb <bkorb@gnu.org>
Date: Sat, 5 Oct 2002 18:21:59 +0000
Subject: [PATCH] add fixes for new hp/ux patch

From-SVN: r57845
---
 gcc/ChangeLog                  | 6 ++++++
 gcc/fixinc/fixincl.x           | 7 ++++---
 gcc/fixinc/inclhack.def        | 4 +++-
 gcc/fixinc/tests/base/stdlib.h | 5 +++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0686d42a14..c8b988fc8db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 4a309368edb..a17fa9b9040 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -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,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 12fc234baaf..787bcb73626 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -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";
 };
 
diff --git a/gcc/fixinc/tests/base/stdlib.h b/gcc/fixinc/tests/base/stdlib.h
index 9e43d13270f..857989cb9cb 100644
--- a/gcc/fixinc/tests/base/stdlib.h
+++ b/gcc/fixinc/tests/base/stdlib.h
@@ -16,6 +16,11 @@
 #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*);