[cfe-commits] r140996 - in /cfe/trunk/test/Driver: Inputs/basic_linux_tree/usr/i386-unknown-linux/ Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/ Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/.keep Inputs/basic_linux_tree/usr/x86_64-unknown-linux/ Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/ Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/.keep linux-ld.c

[Chandler Carruth]

Author: chandlerc
Date: Mon Oct  3 03:09:02 2011
New Revision: 140996

URL: http://llvm.org/viewvc/llvm-project?rev=140996&view=rev
Log:
Test that we include a GCC-triple-prefixed tree. While I don't know of
any distros that use this, building a multilib GCC from mainline will
install linker scripts here.

Added:
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/i386-unknown-linux/
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/.keep
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/x86_64-unknown-linux/
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/
    cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/.keep
Modified:
    cfe/trunk/test/Driver/linux-ld.c

Added: cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/i386-unknown-linux/lib/.keep?rev=140996&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_linux_tree/usr/x86_64-unknown-linux/lib/.keep?rev=140996&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=140996&r1=140995&r2=140996&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Mon Oct  3 03:09:02 2011
@@ -8,6 +8,7 @@
 // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-LD-32: "[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/crtbegin.o"
 // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
+// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
 // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
 // CHECK-LD-32: "-L[[SYSROOT]]/lib"
 // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib"
@@ -19,6 +20,7 @@
 // CHECK-LD-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-LD-64: "[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
 // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
 // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
 // CHECK-LD-64: "-L[[SYSROOT]]/lib"
 // CHECK-LD-64: "-L[[SYSROOT]]/usr/lib"