[cfe-commits] r141159 - in /cfe/trunk: lib/Driver/ test/Driver/ test/Driver/Inputs/gcc_version_parsing1/ test/Driver/Inputs/gcc_version_parsing1/lib/ test/Driver/Inputs/gcc_version_parsing1/lib/gcc/ test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/ test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/ test/Driver/Inputs/gcc_version_parsing2/ test/Driver/Inputs/gcc_version_parsing2/lib/ test/Driver/Inputs/gcc_version_parsing2/lib/gcc/ test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i...

[Chandler Carruth]

Author: chandlerc
Date: Tue Oct  4 22:09:51 2011
New Revision: 141159

URL: http://llvm.org/viewvc/llvm-project?rev=141159&view=rev
Log:
Teach Clang to cope with GCC installations that have unusual patch
"versions". Currently, these are just dropped on the floor, A concrete
version number will always win out.

Added:
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/crtbegin.o
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x/crtbegin.o
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5/
    cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5/crtbegin.o
Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/test/Driver/linux-ld.c

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=141159&r1=141158&r2=141159&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Tue Oct  4 22:09:51 2011
@@ -1508,9 +1508,11 @@
         return BadVersion;
       if (Second.first.getAsInteger(10, GoodVersion.Minor))
         return BadVersion;
-      if (!Second.first.empty())
-        if (Second.first.getAsInteger(10, GoodVersion.Patch))
-          return BadVersion;
+      // We accept a number, or a string for the patch version, in case there
+      // is a strang suffix, or other mangling: '4.1.x', '4.1.2-rc3'. When it
+      // isn't a number, we just use '0' as the number but accept it.
+      if (Second.first.getAsInteger(10, GoodVersion.Patch))
+        GoodVersion.Patch = 0;
       return GoodVersion;
     }
 

Added: cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/crtbegin.o?rev=141159&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x/crtbegin.o?rev=141159&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5/crtbegin.o?rev=141159&view=auto
==============================================================================
    (empty)

Modified: cfe/trunk/test/Driver/linux-ld.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/linux-ld.c?rev=141159&r1=141158&r2=141159&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Tue Oct  4 22:09:51 2011
@@ -110,3 +110,30 @@
 // CHECK-INSTALL-DIR-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-INSTALL-DIR-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
 // CHECK-INSTALL-DIR-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+//
+// Check that we support unusual patch version formats, including missing that
+// component.
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+// RUN:     -ccc-host-triple i386-unknown-linux -m32 \
+// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing1 \
+// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION1 %s
+// CHECK-GCC-VERSION1: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-GCC-VERSION1: "{{.*}}/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7/crtbegin.o"
+// CHECK-GCC-VERSION1: "-L{{.*}}/Inputs/gcc_version_parsing1/lib/gcc/i386-unknown-linux/4.7"
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+// RUN:     -ccc-host-triple i386-unknown-linux -m32 \
+// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing2 \
+// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION2 %s
+// CHECK-GCC-VERSION2: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-GCC-VERSION2: "{{.*}}/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x/crtbegin.o"
+// CHECK-GCC-VERSION2: "-L{{.*}}/Inputs/gcc_version_parsing2/lib/gcc/i386-unknown-linux/4.7.x"
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+// RUN:     -ccc-host-triple i386-unknown-linux -m32 \
+// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing3 \
+// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION3 %s
+// CHECK-GCC-VERSION3: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-GCC-VERSION3: "{{.*}}/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5/crtbegin.o"
+// CHECK-GCC-VERSION3: "-L{{.*}}/Inputs/gcc_version_parsing3/lib/gcc/i386-unknown-linux/4.7.99-rc5"