Attachment #454922 for bug #595834

Lines 1557-1563 bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { Link Here

(-)a/lib/Driver/ToolChains.cpp (+9 lines)
1557	static const char *const ARMLibDirs[] = {"/lib"};	1557	static const char *const ARMLibDirs[] = {"/lib"};
1558	static const char *const ARMTriples[] = {"arm-linux-gnueabi",	1558	static const char *const ARMTriples[] = {"arm-linux-gnueabi",
1559	"arm-linux-androideabi"};	1559	"arm-linux-androideabi"};
		1560	// arm-hardfloat- triples are used by Gentoo
1560	static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",	1561	static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
		1562	"armv6j-hardfloat-linux-gnueabi",
		1563	"armv7a-hardfloat-linux-gnueabi",
1561	"armv7hl-redhat-linux-gnueabi"};	1564	"armv7hl-redhat-linux-gnueabi"};
1562	static const char *const ARMebLibDirs[] = {"/lib"};	1565	static const char *const ARMebLibDirs[] = {"/lib"};
1563	static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",	1566	static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
Lines 1565-1570 bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { Link Here
1565	static const char *const ARMebHFTriples[] = {	1568	static const char *const ARMebHFTriples[] = {
1566	"armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"};	1569	"armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"};
1567		1570
		1571	static const char *const ARMHFMuslTriples[] = {
		1572	"armv6j-hardfloat-linux-musleabi",
		1573	"armv7a-hardfloat-linux-musleabi"};
		1574
1568	static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};	1575	static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
1569	static const char *const X86_64Triples[] = {	1576	static const char *const X86_64Triples[] = {
1570	"x86_64-linux-gnu", "x86_64-unknown-linux-gnu",	1577	"x86_64-linux-gnu", "x86_64-unknown-linux-gnu",
Lines 1664-1669 bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { Link Here
1664	LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));	1671	LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
1665	if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {	1672	if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
1666	TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));	1673	TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));
		1674	} else if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
		1675	TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
1667	} else {	1676	} else {
1668	TripleAliases.append(begin(ARMTriples), end(ARMTriples));	1677	TripleAliases.append(begin(ARMTriples), end(ARMTriples));
1669	}	1678	}




// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9{{/|\\\\}}crtend.o"
// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9/../../../sparc64-linux-gnu{{/|\\\\}}crtn.o"
//
// Check Gentoo Linux with GCC installed using arm*-hardfloat-linux-gnu* triples.
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN:     --target=armv7a-hardfloat-linux-gnueabi --rtlib=platform \
// RUN:     --gcc-toolchain="" \
// RUN:     --sysroot=%S/Inputs/gentoo_linux_gcc_armhf_tree \
// RUN:   | FileCheck --check-prefix=CHECK-LD-GENTOO-ARMHF %s
// CHECK-LD-GENTOO-ARMHF-NOT: warning:
// CHECK-LD-GENTOO-ARMHF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-LD-GENTOO-ARMHF: "--eh-frame-hdr"
// CHECK-LD-GENTOO-ARMHF: "-m" "armelf_linux_eabi"
// CHECK-LD-GENTOO-ARMHF: "-dynamic-linker" "/lib/ld-linux-armhf.so.3"
// CHECK-LD-GENTOO-ARMHF: "{{.*}}/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/crtbegin.o"
// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3"
// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/../../../../armv7a-hardfloat-linux-gnueabi/lib"
// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/../../.."
// CHECK-LD-GENTOO-ARMHF: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
// CHECK-LD-GENTOO-ARMHF: "-lc"
// CHECK-LD-GENTOO-ARMHF: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
//
// Check whether the standard ARM triples can find Gentoo gcc.
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN:     --target=armv7a-unknown-linux-gnueabihf --rtlib=platform \
// RUN:     --gcc-toolchain="" \
// RUN:     --sysroot=%S/Inputs/gentoo_linux_gcc_armhf_tree \
// RUN:   | FileCheck --check-prefix=CHECK-LD-GENTOO-ARMHF %s
//
// Test linker invocation on Android.
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN:     --target=arm-linux-androideabi -rtlib=platform \
- 

Return to bug 595834

Lines 1002-1007 Link Here

(-)a/test/Driver/linux-ld.c (-1 / +26 lines)
1002	// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9{{/\|\\\\}}crtend.o"	1002	// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9{{/\|\\\\}}crtend.o"
1003	// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9/../../../sparc64-linux-gnu{{/\|\\\\}}crtn.o"	1003	// CHECK-DEBIAN-SPARC64: "[[SYSROOT]]/usr/lib/gcc/sparc64-linux-gnu/4.9/../../../sparc64-linux-gnu{{/\|\\\\}}crtn.o"
1004	//	1004	//
		1005	// Check Gentoo Linux with GCC installed using arm-hardfloat-linux-gnu triples.
		1006	// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
		1007	// RUN: --target=armv7a-hardfloat-linux-gnueabi --rtlib=platform \
		1008	// RUN: --gcc-toolchain="" \
		1009	// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_armhf_tree \
		1010	// RUN: \| FileCheck --check-prefix=CHECK-LD-GENTOO-ARMHF %s
		1011	// CHECK-LD-GENTOO-ARMHF-NOT: warning:
		1012	// CHECK-LD-GENTOO-ARMHF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
		1013	// CHECK-LD-GENTOO-ARMHF: "--eh-frame-hdr"
		1014	// CHECK-LD-GENTOO-ARMHF: "-m" "armelf_linux_eabi"
		1015	// CHECK-LD-GENTOO-ARMHF: "-dynamic-linker" "/lib/ld-linux-armhf.so.3"
		1016	// CHECK-LD-GENTOO-ARMHF: "{{.*}}/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/crtbegin.o"
		1017	// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3"
		1018	// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/../../../../armv7a-hardfloat-linux-gnueabi/lib"
		1019	// CHECK-LD-GENTOO-ARMHF: "-L[[SYSROOT]]/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi/4.9.3/../../.."
		1020	// CHECK-LD-GENTOO-ARMHF: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
		1021	// CHECK-LD-GENTOO-ARMHF: "-lc"
		1022	// CHECK-LD-GENTOO-ARMHF: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
		1023	//
		1024	// Check whether the standard ARM triples can find Gentoo gcc.
		1025	// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
		1026	// RUN: --target=armv7a-unknown-linux-gnueabihf --rtlib=platform \
		1027	// RUN: --gcc-toolchain="" \
		1028	// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_armhf_tree \
		1029	// RUN: \| FileCheck --check-prefix=CHECK-LD-GENTOO-ARMHF %s
		1030	//
1005	// Test linker invocation on Android.	1031	// Test linker invocation on Android.
1006	// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \	1032	// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
1007	// RUN: --target=arm-linux-androideabi -rtlib=platform \	1033	// RUN: --target=arm-linux-androideabi -rtlib=platform \
1008	-