From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 12 Nov 2000 04:16:07 +0000 (+0000)
Subject: 	* fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6c5ab26aa4c5bfc73a3969c3720ee96c3480c39;p=thirdparty%2Fgcc.git

	* fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr
	declarations that use `__MATH_EXCEPTION' in their prototypes, too.
	* fixinc/fixincl.x: Regenerated.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d380b7b0fb12..c4060f3bd974 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov 11 21:14:02 2000  Mark P Mitchell  <mark@codesourcery.com>
+
+	* fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr
+	declarations that use `__MATH_EXCEPTION' in their prototypes, too.
+	* fixinc/fixincl.x: Regenerated.
+	
 2000-11-11  Bruce Korb  <bkorb@gnu.org>
 
 	* fixinc/inclhack.def (avoid_bool_type): avoid commenting out #endif
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 92912600b1d3..ddfe5a5d2267 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -4021,7 +4021,7 @@ tSCC zSunos_Matherr_DeclSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zSunos_Matherr_DeclBypass0[] =
-       "matherr.*struct exception";
+       "matherr.*(struct exception|__MATH_EXCEPTION)";
 
 #define    SUNOS_MATHERR_DECL_TEST_CT  2
 static tTestDesc aSunos_Matherr_DeclTests[] = {
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 73b50fd36a7b..a172593cdc51 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2201,7 +2201,7 @@ fix = {
     files     = math.h;
 
     /*  If matherr has a prototype already, the header needs no fix.  */
-    bypass    = 'matherr.*struct exception';
+    bypass    = 'matherr.*(struct exception|__MATH_EXCEPTION)';
     select    = matherr;
 
     c_fix     = wrap;