This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Correct fixincludes bypass for glibc_tgmath


I noticed that the glibc_tgmath fixinclude wasn't being correctly bypassed 
for fixed glibc versions - I evidently hadn't verified that 
<http://gcc.gnu.org/ml/gcc-patches/2008-11/msg00128.html> really did 
bypass it when it should.  I've applied this patch to fix this, which 
really does bypass the fix for current glibc.

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 147570)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2009-05-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* inclhack.def (glibc_tgmath): Correct bypass.
+	* fixincl.x: Regenerate.
+
 2009-04-28  Steve Ellcey  <sje@cup.hp.com>
 
 	* inclhack.def (hpux11_uint32_c): Remove.
Index: fixincl.x
===================================================================
--- fixincl.x	(revision 147570)
+++ fixincl.x	(working copy)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Tuesday April 28, 2009 at 08:26:48 AM PDT
+ * It has been AutoGen-ed  Friday May 15, 2009 at 07:23:47 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 28 08:26:48 PDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May 15 07:23:47 PDT 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -2282,7 +2282,7 @@
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zGlibc_TgmathBypass0[] =
-       "__floating_type \\\\\n\
+       "__floating_type\\(type\\) \\\\\n\
 .*__builtin_classify_type";
 
 #define    GLIBC_TGMATH_TEST_CT  2
Index: inclhack.def
===================================================================
--- inclhack.def	(revision 147570)
+++ inclhack.def	(working copy)
@@ -1286,7 +1286,7 @@
     hackname  = glibc_tgmath;
     files     = tgmath.h;
     select    = '\(\(\(type\) 0.25\) && \(\(type\) 0.25 - 1\)\)';
-    bypass    = "__floating_type \\\\\n.*__builtin_classify_type";
+    bypass    = "__floating_type\\(type\\) \\\\\n.*__builtin_classify_type";
     c_fix     = format;
     c_fix_arg = "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))";
     test_text = "# define __floating_type(type) (((type) 0.25) && ((type) 0.25 - 1))";

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]