This is an archive of the discontinued LLVM Phabricator instance.

Differential D32347

Add support for openSUSE ARM Triples
ClosedPublic

Authored by ismail on Apr 21 2017, 4:06 AM.

Details

Reviewers
rovka
rengolin
compnerd
cfe-commits
Commits
rGca9cdadeabe6: Add support for openSUSE ARM Triples
rC300969: Add support for openSUSE ARM Triples
rL300969: Add support for openSUSE ARM Triples
Summary

Add support for armv6hl-suse-linux-gnueabi and armv7hl-suse-linux-gnueabi triples used by openSUSE/SUSE.

Diff Detail

Event Timeline

ismail created this revision.Apr 21 2017, 4:06 AM
Herald added a subscriber: aemerson. · View Herald TranscriptApr 21 2017, 4:06 AM
rengolin added a comment.Apr 21 2017, 5:09 AM

Nothing new here, pretty much standard. No "gnueabihf"?

ismail added a comment.Apr 21 2017, 5:10 AM
In D32347#733474, @rengolin wrote:

Nothing new here, pretty much standard. No "gnueabihf"?

Yes openSUSE prefers the "hl" prefix to mean HardFloat.

rengolin added reviewers: rovka, compnerd.Apr 21 2017, 5:15 AM
In D32347#733475, @ismail wrote:

Yes openSUSE prefers the "hl" prefix to mean HardFloat.

I'm not sure that'll do what you expect it, though. Having the "hf" at the end of the triple has some magical effect on the Triple class.

But at the very least, you should make sure that float-abi is indeed hard.

I'm adding Diana and Saleem, who have had more exposure to float abi shenanigans than I have, recently.

ismail added a comment.Apr 21 2017, 5:18 AM
In D32347#733476, @rengolin wrote:
In D32347#733475, @ismail wrote:

Yes openSUSE prefers the "hl" prefix to mean HardFloat.

I'm not sure that'll do what you expect it, though. Having the "hf" at the end of the triple has some magical effect on the Triple class.

Indeed it doesn't hence we set the correct CFLAGS/CXXFLAGS separately for the moment.

But at the very least, you should make sure that float-abi is indeed hard.

Yes I'll work on that next. This is just to get the triple correct, which lets me bootstrap the compiler.

rengolin accepted this revision.Apr 21 2017, 5:32 AM

Ok, I see no harm in letting you work upstream, since no one should be relying on the correct behaviour on opensuse for now. LGTM. Thanks!

This revision is now accepted and ready to land.Apr 21 2017, 5:32 AM
ismail closed this revision.Apr 21 2017, 5:39 AM
aaronpuchert mentioned this in D55326: [Driver] Fix incorrect GNU triplet for PowerPC on SUSE Linux.Aug 10 2019, 7:50 AM

Revision Contents

PathSize
lib/
Driver/
ToolChains/
4 lines
test/
Driver/
Inputs/
opensuse_tumbleweed_armv6hl_tree/
usr/
lib/
gcc/
armv6hl-suse-linux-gnueabi/
5/
opensuse_tumbleweed_armv7hl_tree/
usr/
lib/
gcc/
armv7hl-suse-linux-gnueabi/
5/
40 lines

Diff 96121

lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 1,741 Lines • ▼ Show 20 Lines/*static*/ void Generic_GCC::GCCInstallationDetector::CollectLibDirsAndTriples(
static const char *const AArch64beLibDirs[] = {"/lib"}; static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
"aarch64_be-linux-gnu"}; "aarch64_be-linux-gnu"};
static const char *const ARMLibDirs[] = {"/lib"}; static const char *const ARMLibDirs[] = {"/lib"};
static const char *const ARMTriples[] = {"arm-linux-gnueabi", static const char *const ARMTriples[] = {"arm-linux-gnueabi",
"arm-linux-androideabi"}; "arm-linux-androideabi"};
static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
"armv7hl-redhat-linux-gnueabi"}; "armv7hl-redhat-linux-gnueabi",
"armv6hl-suse-linux-gnueabi",
"armv7hl-suse-linux-gnueabi"};
static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebLibDirs[] = {"/lib"};
static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
"armeb-linux-androideabi"}; "armeb-linux-androideabi"};
static const char *const ARMebHFTriples[] = { static const char *const ARMebHFTriples[] = {
"armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"}; "armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"};
static const char *const X86_64LibDirs[] = {"/lib64", "/lib"}; static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
static const char *const X86_64Triples[] = { static const char *const X86_64Triples[] = {
▲ Show 20 Lines • Show All 652 Lines • Show Last 20 Lines

test/Driver/Inputs/opensuse_tumbleweed_armv6hl_tree/usr/lib/crt1.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv6hl_tree/usr/lib/crti.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv6hl_tree/usr/lib/crtn.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv6hl_tree/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/crtbegin.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv6hl_tree/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/crtend.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv7hl_tree/usr/lib/crt1.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv7hl_tree/usr/lib/crti.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv7hl_tree/usr/lib/crtn.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv7hl_tree/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/crtbegin.o

The contents of this file were not changed.

test/Driver/Inputs/opensuse_tumbleweed_armv7hl_tree/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/crtend.o

The contents of this file were not changed.

test/Driver/linux-ld.c

Show First 20 Lines • Show All 632 Lines • ▼ Show 20 Lines
// CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crt1.o" // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crt1.o"
// CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crti.o" // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crti.o"
// CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8{{/|\\\\}}crtbegin.o" // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8{{/|\\\\}}crtbegin.o"
// CHECK-OPENSUSE-42-2-AARCH64: "-L[[SYSROOT]]/usr/lib64/gcc/aarch64-suse-linux/4.8" // CHECK-OPENSUSE-42-2-AARCH64: "-L[[SYSROOT]]/usr/lib64/gcc/aarch64-suse-linux/4.8"
// CHECK-OPENSUSE-42-2-AARCH64: "-L[[SYSROOT]]/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64" // CHECK-OPENSUSE-42-2-AARCH64: "-L[[SYSROOT]]/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64"
// CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8{{/|\\\\}}crtend.o" // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8{{/|\\\\}}crtend.o"
// CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crtn.o" // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crtn.o"
// //
// Check openSUSE Tumbleweed on armv6hl
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=armv6hl-suse-linux-gnueabi \
// RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/opensuse_tumbleweed_armv6hl_tree \
// RUN: | FileCheck --check-prefix=CHECK-OPENSUSE-TW-ARMV6HL %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=armv6hl-suse-linux-gnueabi \
// RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/opensuse_tumbleweed_armv6hl_tree \
// RUN: | FileCheck --check-prefix=CHECK-OPENSUSE-TW-ARMV6HL %s
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crt1.o"
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crti.o"
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5{{/|\\\\}}crtbegin.o"
// CHECK-OPENSUSE-TW-ARMV6HL: "-L[[SYSROOT]]/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5"
// CHECK-OPENSUSE-TW-ARMV6HL: "-L[[SYSROOT]]/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/../../../../lib"
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5{{/|\\\\}}crtend.o"
// CHECK-OPENSUSE-TW-ARMV6HL: "{{.*}}/usr/lib/gcc/armv6hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crtn.o"
//
// Check openSUSE Tumbleweed on armv7hl
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=armv7hl-suse-linux-gnueabi \
// RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/opensuse_tumbleweed_armv7hl_tree \
// RUN: | FileCheck --check-prefix=CHECK-OPENSUSE-TW-ARMV7HL %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=armv7hl-suse-linux-gnueabi \
// RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/opensuse_tumbleweed_armv7hl_tree \
// RUN: | FileCheck --check-prefix=CHECK-OPENSUSE-TW-ARMV7HL %s
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crt1.o"
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crti.o"
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5{{/|\\\\}}crtbegin.o"
// CHECK-OPENSUSE-TW-ARMV7HL: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5"
// CHECK-OPENSUSE-TW-ARMV7HL: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/../../../../lib"
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5{{/|\\\\}}crtend.o"
// CHECK-OPENSUSE-TW-ARMV7HL: "{{.*}}/usr/lib/gcc/armv7hl-suse-linux-gnueabi/5/../../../../lib{{/|\\\\}}crtn.o"
//
// Check dynamic-linker for different archs // Check dynamic-linker for different archs
// RUN: %clang %s -### -o %t.o 2>&1 \ // RUN: %clang %s -### -o %t.o 2>&1 \
// RUN: --target=arm-linux-gnueabi \ // RUN: --target=arm-linux-gnueabi \
// RUN: | FileCheck --check-prefix=CHECK-ARM %s // RUN: | FileCheck --check-prefix=CHECK-ARM %s
// CHECK-ARM: "{{.*}}ld{{(.exe)?}}" // CHECK-ARM: "{{.*}}ld{{(.exe)?}}"
// CHECK-ARM: "-m" "armelf_linux_eabi" // CHECK-ARM: "-m" "armelf_linux_eabi"
// CHECK-ARM: "-dynamic-linker" "{{.*}}/lib/ld-linux.so.3" // CHECK-ARM: "-dynamic-linker" "{{.*}}/lib/ld-linux.so.3"
// //
▲ Show 20 Lines • Show All 1,097 Lines • Show Last 20 Lines