summaryrefslogtreecommitdiff
path: root/gcc/fixinc
diff options
context:
space:
mode:
authorkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>2002-10-05 18:21:59 +0000
committerkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>2002-10-05 18:21:59 +0000
commit4842028bea1728de18df992b531c96789dce0303 (patch)
treedeb77ad8381b391d35645ea4399d1d918acedccc /gcc/fixinc
parent1e583ea6e35aec0766d2f95e647d5e6d5825cdc2 (diff)
downloadgcc-4842028bea1728de18df992b531c96789dce0303.tar.gz
add fixes for new hp/ux patch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57845 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fixinc')
-rw-r--r--gcc/fixinc/fixincl.x7
-rw-r--r--gcc/fixinc/inclhack.def4
-rw-r--r--gcc/fixinc/tests/base/stdlib.h5
3 files changed, 12 insertions, 4 deletions
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*);