[llvm-commits] [llvm-gcc-4.2] r75551 - /llvm-gcc-4.2/trunk/fixincludes/inclhack.def

[Anton Korobeynikov]

Author: asl
Date: Mon Jul 13 18:41:03 2009
New Revision: 75551

URL: http://llvm.org/viewvc/llvm-project?rev=75551&view=rev
Log:
Use fixincludes to tweak bogus glibc FD_ZERO code. This fixes PR4549

Modified:
    llvm-gcc-4.2/trunk/fixincludes/inclhack.def

Modified: llvm-gcc-4.2/trunk/fixincludes/inclhack.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/inclhack.def?rev=75551&r1=75550&r2=75551&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/inclhack.def (original)
+++ llvm-gcc-4.2/trunk/fixincludes/inclhack.def Mon Jul 13 18:41:03 2009
@@ -1108,8 +1108,8 @@
  */
 fix = {
     hackname  = bsd_stdio_attrs_conflict;
-    mach      = *-*-*bsd*;
-    mach      = *-*-*darwin*;
+    mach      = "*-*-*bsd*";
+    mach      = "*-*-*darwin*";
     files     = stdio.h;
     select    = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
     c_fix     = format;
@@ -1364,7 +1364,7 @@
  */
 fix = {
     hackname  = freebsd_gcc3_breakage;
-    mach      = *-*-freebsd*;
+    mach      = "*-*-freebsd*";
     files     = sys/cdefs.h;
     select    = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$';
     bypass    = '__GNUC__[ \t]*([>=]=[ \t]*[3-9]|>[ \t]*2)';
@@ -1381,7 +1381,7 @@
  */
 fix = {
     hackname  = freebsd_gcc4_breakage;
-    mach      = *-*-freebsd*; 
+    mach      = "*-*-freebsd*";
     files     = sys/cdefs.h;
     select    = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \|\| __GNUC__ == 3$';
     c_fix     = format;
@@ -1656,7 +1656,7 @@
  */
 fix = {
     hackname  = hpux11_abs;
-    mach      = ia64-hp-hpux11*;
+    mach      = "ia64-hp-hpux11*";
     files     = stdlib.h;
     select    = "ifndef _MATH_INCLUDED";
     c_fix     = format;
@@ -2606,7 +2606,7 @@
  */
 fix = {
     hackname  = netbsd_extra_semicolon;
-    mach      = *-*-netbsd*;
+    mach      = "*-*-netbsd*";
     files     = sys/cdefs.h;
     select    = "#define[ \t]*__END_DECLS[ \t]*};";
 
@@ -4960,4 +4960,18 @@
     test_text = "extern char *\tsprintf();";
 };
 
+/* LLVM LOCAL begin */
+/*
+ *  Incorrect FD_ZERO inline assembler
+ */
+fix = {
+    hackname  = glibc_fdzero_inline_asm;
+    files     = bits/select.h;
+    select    = '^[ \t]*int __d0, __d1*';
+
+    sed       = "s/int __d0, __d1;/__intptr_t __d0, __d1;/g";
+    test_text = "int __d0, __d1;";
+};
+/* LLVM LOCAL end */
+
 /*EOF*/