[cfe-commits] r141000 - in /cfe/trunk/test/Driver: ./ Inputs/multilib_64bit_linux_tree/ Inputs/multilib_64bit_linux_tree/lib/ Inputs/multilib_64bit_linux_tree/lib32/ Inputs/multilib_64bit_linux_tree/lib64/ Inputs/multilib_64bit_linux_tree/usr/ Inputs/multilib_64bit_linux_tree/usr/lib/ Inputs/multilib_64bit_linux_tree/usr/lib/gcc/ Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/ Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/ Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64...

Chandler Carruth chandlerc at gmail.com
Mon Oct 3 02:08:26 PDT 2011


Author: chandlerc
Date: Mon Oct  3 04:08:26 2011
New Revision: 141000

URL: http://llvm.org/viewvc/llvm-project?rev=141000&view=rev
Log:
Test a multilib setup on a 64-bit host. This is the far more common
configuration, although the test still stubs out more directories than
are necessary or common in order to exercise all of the lookup paths
observed with upstream GCC.

This finishes testing the distribution-independent and
GCC-installation-independent parts of the library path search logic.
More testing is still needed for the triple detection, GCC-installation
detection, and handling distributions with unusual configurations.

Added:
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib32/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib32/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib64/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib64/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib32/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib32/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib64/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib64/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib32/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib32/.keep
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib64/
    cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib64/.keep
Modified:
    cfe/trunk/test/Driver/linux-ld.c

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib/.keep?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib32/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib32/.keep?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib64/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/lib64/.keep?rev=141000&view=auto
==============================================================================
    (empty)

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

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib32/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib32/.keep?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib64/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/lib64/.keep?rev=141000&view=auto
==============================================================================
    (empty)

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

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib32/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib32/.keep?rev=141000&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib64/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/lib64/.keep?rev=141000&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=141000&r1=140999&r2=141000&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Mon Oct  3 04:08:26 2011
@@ -57,3 +57,36 @@
 // CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
 // CHECK-32-TO-64: "-L[[SYSROOT]]/lib"
 // CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib"
+//
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+// RUN:     -ccc-host-triple x86_64-unknown-linux -m64 \
+// RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-64-TO-64 %s
+// CHECK-64-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-64-TO-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/crtbegin.o"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib64"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib64"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/lib/../lib64"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/../lib64"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+// CHECK-64-TO-64: "-L[[SYSROOT]]/lib"
+// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib"
+//
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+// RUN:     -ccc-host-triple x86_64-unknown-linux -m32 \
+// RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-64-TO-32 %s
+// CHECK-64-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-64-TO-32: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32/crtbegin.o"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib32"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib32"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/lib/../lib32"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/../lib32"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+// CHECK-64-TO-32: "-L[[SYSROOT]]/lib"
+// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib"





More information about the cfe-commits mailing list