This is an archive of the discontinued LLVM Phabricator instance.

Differential D74399

[Driver][RISCV] Add RedHat Linux RISC-V triple
ClosedPublic

Authored by luismarques on Feb 11 2020, 5:30 AM.

Details

Reviewers
lenary
asb
dlj
Commits
rG9816e726e747: [Driver][RISCV] Add RedHat Linux RISC-V triple
Summary

Adds the RedHat Linux triple to the list of 64-bit RISC-V triples. Without this the gcc libraries wouldn't be found by clang on a redhat/fedora system, as the search list included /usr/lib/gcc/riscv64-redhat-linux-gnu but the correct path didn't include the -gnu suffix.

Diff Detail

Event Timeline

luismarques created this revision.Feb 11 2020, 5:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 11 2020, 5:30 AM
Herald added subscribers: cfe-commits, evandro, sameer.abuasal and 10 others. · View Herald Transcript
lenary accepted this revision.Feb 11 2020, 5:57 AM

LGTM!

This revision is now accepted and ready to land.Feb 11 2020, 5:57 AM
lebedev.ri added a subscriber: lebedev.ri.Feb 11 2020, 6:06 AM

passing-by remark: tests missing

luismarques updated this revision to Diff 244187.Feb 12 2020, 8:13 AM

Adds a test (using the RISC-V Fedora 31 paths).

Herald added subscribers: apazos, pzheng, jocewei and 9 others. · View Herald TranscriptFeb 12 2020, 8:13 AM
luismarques updated this revision to Diff 244211.Feb 12 2020, 9:55 AM

Correct paths.

Closed by commit rG9816e726e747: [Driver][RISCV] Add RedHat Linux RISC-V triple (authored by luismarques). · Explain WhyFeb 14 2020, 5:47 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: jrtc27. · View Herald TranscriptFeb 14 2020, 5:48 AM
luismarques mentioned this in D109727: [Driver] Remove unneeded *-suse-* triples.Sep 16 2021, 4:36 AM
MaskRay added a reverting change: rGa07727199db0: Revert code change of D63497 & D74399 for riscv64-*-linux GCC detection.Sep 20 2021, 10:28 AM
rkruppe removed a subscriber: rkruppe.Sep 29 2021, 8:48 AM
Herald added subscribers: achieveartificialintelligence, vkmr, frasercrmck. · View Herald TranscriptSep 29 2021, 8:48 AM
MaskRay mentioned this in D158100: Clang/MIPS: Use correct cross env if both r6 and legacy are installed.Aug 17 2023, 8:54 AM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
1 line
test/
Driver/
Inputs/
fedora_31_riscv64_tree/
usr/
lib/
gcc/
riscv64-redhat-linux/
9/
lib64/
15 lines

Diff 244211

clang/lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 2,084 Lines • ▼ Show 20 Lines/*static*/ void Generic_GCC::GCCInstallationDetector::CollectLibDirsAndTriples(
static const char *const RISCV32LibDirs[] = {"/lib32", "/lib"}; static const char *const RISCV32LibDirs[] = {"/lib32", "/lib"};
static const char *const RISCV32Triples[] = {"riscv32-unknown-linux-gnu", static const char *const RISCV32Triples[] = {"riscv32-unknown-linux-gnu",
"riscv32-linux-gnu", "riscv32-linux-gnu",
"riscv32-unknown-elf"}; "riscv32-unknown-elf"};
static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"}; static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"};
static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu", static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu",
"riscv64-linux-gnu", "riscv64-linux-gnu",
"riscv64-unknown-elf", "riscv64-unknown-elf",
"riscv64-redhat-linux",
"riscv64-suse-linux"}; "riscv64-suse-linux"};
static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"}; static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
static const char *const SPARCv8Triples[] = {"sparc-linux-gnu", static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
"sparcv8-linux-gnu"}; "sparcv8-linux-gnu"};
static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"}; static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu", static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
"sparcv9-linux-gnu"}; "sparcv9-linux-gnu"};
▲ Show 20 Lines • Show All 769 Lines • Show Last 20 Lines

clang/test/Driver/Inputs/fedora_31_riscv64_tree/usr/lib/gcc/riscv64-redhat-linux/9/crtbegin.o

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/fedora_31_riscv64_tree/usr/lib/gcc/riscv64-redhat-linux/9/crtend.o

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/fedora_31_riscv64_tree/usr/lib/gcc/riscv64-redhat-linux/9/crti.o

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/fedora_31_riscv64_tree/usr/lib/gcc/riscv64-redhat-linux/9/crtn.o

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/fedora_31_riscv64_tree/usr/lib64/crt1.o

  • This file was added.
This is an empty file.

clang/test/Driver/linux-ld.c

Show First 20 Lines • Show All 763 Lines • ▼ Show 20 Lines
// CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crt1.o" // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crt1.o"
// CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crti.o" // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crti.o"
// CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0{{/|\\\\}}crtbegin.o" // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0{{/|\\\\}}crtbegin.o"
// CHECK-FEDORA-21-AARCH64: "-L[[SYSROOT]]/usr/lib/gcc/aarch64-redhat-linux/4.9.0" // CHECK-FEDORA-21-AARCH64: "-L[[SYSROOT]]/usr/lib/gcc/aarch64-redhat-linux/4.9.0"
// CHECK-FEDORA-21-AARCH64: "-L[[SYSROOT]]/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64" // CHECK-FEDORA-21-AARCH64: "-L[[SYSROOT]]/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64"
// CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0{{/|\\\\}}crtend.o" // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0{{/|\\\\}}crtend.o"
// CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crtn.o" // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crtn.o"
// //
// Check Fedora 31 on riscv64.
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=riscv64-redhat-linux -rtlib=platform \
// RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/fedora_31_riscv64_tree \
// RUN: | FileCheck --check-prefix=CHECK-FEDORA-31-RISCV64 %s
// CHECK-FEDORA-31-RISCV64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-FEDORA-31-RISCV64: "{{.*}}/usr/lib/gcc/riscv64-redhat-linux/9/../../../../lib64{{/|\\\\}}crt1.o"
// CHECK-FEDORA-31-RISCV64: "{{.*}}/usr/lib/gcc/riscv64-redhat-linux/9{{/|\\\\}}crti.o"
// CHECK-FEDORA-31-RISCV64: "{{.*}}/usr/lib/gcc/riscv64-redhat-linux/9{{/|\\\\}}crtbegin.o"
// CHECK-FEDORA-31-RISCV64: "-L[[SYSROOT]]/usr/lib/gcc/riscv64-redhat-linux/9"
// CHECK-FEDORA-31-RISCV64: "-L[[SYSROOT]]/usr/lib/gcc/riscv64-redhat-linux/9/../../../../lib64"
// CHECK-FEDORA-31-RISCV64: "{{.*}}/usr/lib/gcc/riscv64-redhat-linux/9{{/|\\\\}}crtend.o"
// CHECK-FEDORA-31-RISCV64: "{{.*}}/usr/lib/gcc/riscv64-redhat-linux/9{{/|\\\\}}crtn.o"
//
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=arm-unknown-linux-gnueabi -rtlib=platform \ // RUN: --target=arm-unknown-linux-gnueabi -rtlib=platform \
// RUN: --gcc-toolchain="" \ // RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \ // RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \
// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM %s // RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM %s
// CHECK-UBUNTU-12-04-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-UBUNTU-12-04-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crt1.o" // CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crt1.o"
// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crti.o" // CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crti.o"
▲ Show 20 Lines • Show All 1,404 Lines • Show Last 20 Lines