This is an archive of the discontinued LLVM Phabricator instance.

Differential D74704

Support -fuse-ld=lld for riscv
ClosedPublic

Authored by serge-sans-paille on Feb 17 2020, 5:02 AM.

Details

Reviewers
asb
lenary
jrtc27
MaskRay
Commits
rGe058667a2e01: Support -fuse-ld=lld for riscv
rGdd230142d8a0: Support -fuse-ld=lld for riscv

Diff Detail

Event Timeline

serge-sans-paille created this revision.Feb 17 2020, 5:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 17 2020, 5:02 AM
Herald added subscribers: cfe-commits, evandro, luismarques and 25 others. · View Herald Transcript
serge-sans-paille updated this revision to Diff 244943.Feb 17 2020, 5:04 AM

Add test case. This test fails with current master, see https://bugzilla.redhat.com/show_bug.cgi?id=1803698

lenary added a comment.Feb 17 2020, 6:30 AM

I am worried about the interaction between -fuse-ld=lld and linker relaxation (which is not supported by LLD, as I understand it)

  1. clang could ignore -fuse-ld=lld when linker relaxation is enabled
  2. clang could ignore (disable) linker relaxation if -fuse-ld=lld is used

At the very least, a warning of some kind should be emitted if linker relaxation is combined with -fuse-ld=lld.

jrtc27 added a comment.Feb 17 2020, 6:40 AM
In D74704#1878921, @lenary wrote:

I am worried about the interaction between -fuse-ld=lld and linker relaxation (which is not supported by LLD, as I understand it)

  1. clang could ignore -fuse-ld=lld when linker relaxation is enabled
  2. clang could ignore (disable) linker relaxation if -fuse-ld=lld is used

At the very least, a warning of some kind should be emitted if linker relaxation is combined with -fuse-ld=lld.

This isn't a new problem. The Linux and FreeBSD toolchains already support -fuse-ld=lld properly, it's just the bare metal one that didn't. People also generally don't include -fuse-ld=lld in CFLAGS, only LDFLAGS, and there's no need to include -mno-relax in LDFLAGS, so I suspect you wouldn't catch many issues. These days (https://reviews.llvm.org/D71820), LLD will give you an informative error (rather than silently mis-linking) if you forget -mno-relax.

lenary accepted this revision.Feb 17 2020, 6:50 AM
In D74704#1878944, @jrtc27 wrote:

This isn't a new problem. The Linux and FreeBSD toolchains already support -fuse-ld=lld properly, it's just the bare metal one that didn't. People also generally don't include -fuse-ld=lld in CFLAGS, only LDFLAGS, and there's no need to include -mno-relax in LDFLAGS, so I suspect you wouldn't catch many issues. These days (https://reviews.llvm.org/D71820), LLD will give you an informative error (rather than silently mis-linking) if you forget -mno-relax.

Ah, ok, I see how these parts fit together now.

LGTM!

This revision is now accepted and ready to land.Feb 17 2020, 6:50 AM
Closed by commit rGdd230142d8a0: Support -fuse-ld=lld for riscv (authored by serge-sans-paille). · Explain WhyFeb 18 2020, 2:24 AM
This revision was automatically updated to reflect the committed changes.
vvereschaka added a subscriber: vvereschaka.Feb 18 2020, 10:23 AM

Hello @serge-sans-paille,

looks like these changes broke the ARM builders:
http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/4749
http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64/builds/4752

failed tests:

  • FAIL: Clang::riscv64-toolchain.c
  • FAIL: Clang::riscv32-toolchain.c

with the following error:

C:\buildbot\as-builder-1\llvm-clang-win-x-armv7l\llvm-project\clang\test\Driver\riscv64-toolchain.c:15:27: error: C-RV64-BAREMETAL-LP64: expected string not found in input

would you fix the problem or revert the commit?

leonardchan added a subscriber: leonardchan.Feb 18 2020, 11:12 AM
In D74704#1881012, @vvereschaka wrote:

Hello @serge-sans-paille,

looks like these changes broke the ARM builders:
http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/4749
http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64/builds/4752

failed tests:

  • FAIL: Clang::riscv64-toolchain.c
  • FAIL: Clang::riscv32-toolchain.c

with the following error:

C:\buildbot\as-builder-1\llvm-clang-win-x-armv7l\llvm-project\clang\test\Driver\riscv64-toolchain.c:15:27: error: C-RV64-BAREMETAL-LP64: expected string not found in input

would you fix the problem or revert the commit?

*Bump* We're also seeing this for our clang bots:

Failing Tests (4):
    Clang :: Driver/riscv32-toolchain-extra.c
    Clang :: Driver/riscv32-toolchain.c
    Clang :: Driver/riscv64-toolchain-extra.c
    Clang :: Driver/riscv64-toolchain.c

Would you mind addressing this or reverting? Thanks.

Builder log: https://luci-milo.appspot.com/p/fuchsia/builders/ci/clang-linux-x64/b8888123323499438832

serge-sans-paille added a comment.Feb 18 2020, 11:54 AM

I'll revert and propose an updated patch then.

serge-sans-paille added a comment.Feb 18 2020, 11:57 AM

Reverted through b8bea9346af4f2644c9a1bd29710c5e3efbbd7d3

MaskRay added a comment.Feb 18 2020, 12:00 PM

The problem may be -DCLANG_DEFAULT_LINKER=lld.

(FWIW I really don't like supporting numerous -D configurations and ask authors to revert because of some weird -D configurations.)

jrtc27 reopened this revision.Feb 20 2020, 9:58 AM
This revision is now accepted and ready to land.Feb 20 2020, 9:58 AM
jrtc27 requested changes to this revision.Feb 20 2020, 9:58 AM
This revision now requires changes to proceed.Feb 20 2020, 9:58 AM
serge-sans-paille added a comment.Feb 20 2020, 11:08 AM

For the record: http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/4749/steps/test-check-clang/logs/FAIL%3A%20Clang%3A%3Ariscv64-toolchain.c fails

serge-sans-paille updated this revision to Diff 245805.Feb 21 2020, 1:42 AM

Add a configure feature test to filter out tests that depend on platform linker, as hinted by @MaskRay

Harbormaster completed remote builds in B46980: Diff 245805.Feb 21 2020, 2:02 AM
MaskRay accepted this revision.Feb 21 2020, 9:37 AM
This revision was not accepted when it landed; it landed in state Needs Review.Feb 26 2020, 1:21 AM
Closed by commit rGe058667a2e01: Support -fuse-ld=lld for riscv (authored by serge-sans-paille). · Explain Why
This revision was automatically updated to reflect the committed changes.
leonardchan added a comment.Feb 26 2020, 10:23 AM

Hi again, I think e058667a2e017d3225a9bb067dbac7f2159576f7 might've broken our toolchain again:

FAIL: Clang :: Driver/riscv32-toolchain-extra.c (5723 of 17018)
******************** TEST 'Clang :: Driver/riscv32-toolchain-extra.c' FAILED ********************
Script:
--
: 'RUN: at line 14';   mkdir -p /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin
: 'RUN: at line 15';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/clang ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/clang
: 'RUN: at line 16';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/riscv32-unknown-elf-ld ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/riscv32-unknown-elf-ld
: 'RUN: at line 17';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/riscv32-unknown-elf ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/riscv32-unknown-elf
: 'RUN: at line 18';   ln -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/clang /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/clang
: 'RUN: at line 19';   ln -s /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/Inputs/basic_riscv32_nogcc_tree/bin/riscv32-unknown-elf-ld /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/riscv32-unknown-elf-ld
: 'RUN: at line 20';   ln -s /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/Inputs/basic_riscv32_nogcc_tree/riscv32-unknown-elf /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/riscv32-unknown-elf
: 'RUN: at line 21';   /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/clang /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv32-toolchain-extra.c -### -no-canonical-prefixes     --gcc-toolchain=/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/invalid     -target riscv32-unknown-elf --rtlib=platform 2>&1     | /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/FileCheck -check-prefix=C-RV32-BAREMETAL-ILP32-NOGCC /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv32-toolchain-extra.c
--
Exit Code: 1

Command Output (stderr):
--
/b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv32-toolchain-extra.c:27:34: error: C-RV32-BAREMETAL-ILP32-NOGCC: expected string not found in input
// C-RV32-BAREMETAL-ILP32-NOGCC: "{{.*}}Output/testroot-riscv32-baremetal-nogcc/bin/riscv32-unknown-elf-ld"
                                 ^
<stdin>:5:1070: note: scanning from here
 "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/clang" "-cc1" "-triple" "riscv32-unknown-unknown-elf" "-emit-obj" "-mrelax-all" "--mrelax-relocations" "-disable-free" "-disable-llvm-verifier" "-discard-value-names" "-main-file-name" "riscv32-toolchain-extra.c" "-mrelocation-model" "static" "-mthread-model" "posix" "-mframe-pointer=all" "-fmath-errno" "-fno-rounding-math" "-masm-verbose" "-mconstructor-aliases" "-nostdsysteminc" "-target-feature" "+m" "-target-feature" "+a" "-target-feature" "+c" "-target-feature" "+relax" "-target-feature" "-save-restore" "-target-abi" "ilp32" "-dwarf-column-info" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/lib/clang/11.0.0" "-internal-isystem" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/../riscv32-unknown-elf/include" "-fdebug-compilation-dir" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver" "-ferror-limit" "19" "-fmessage-length" "0" "-fno-signed-char" "-fgnuc-version=4.2.1" "-fobjc-runtime=gcc" "-fdiagnostics-show-option" "-faddrsig" "-o" "/tmp/riscv32-toolchain-extra-b2b7d0.o" "-x" "c" "/b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv32-toolchain-extra.c"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             ^
<stdin>:6:169: note: possible intended match here
 "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/ld.lld" "-m" "elf32lriscv" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/../riscv32-unknown-elf/lib/crt0.o" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/lib/clang/11.0.0/lib/clang_rt.crtbegin-riscv32.o" "-L/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/bin/../riscv32-unknown-elf/lib" "/tmp/riscv32-toolchain-extra-b2b7d0.o" "--start-group" "-lc" "-lgloss" "--end-group" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/lib/clang/11.0.0/lib/libclang_rt.builtins-riscv32.a" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv32-baremetal-nogcc/lib/clang/11.0.0/lib/clang_rt.crtend-riscv32.o" "-o" "a.out"
                                                                                                                                                                        ^

--

********************
Testing:  0.. 10.. 20.. 30
FAIL: Clang :: Driver/riscv64-toolchain-extra.c (5733 of 17018)
******************** TEST 'Clang :: Driver/riscv64-toolchain-extra.c' FAILED ********************
Script:
--
: 'RUN: at line 14';   mkdir -p /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin
: 'RUN: at line 15';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/clang ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/clang
: 'RUN: at line 16';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/riscv64-unknown-elf-ld ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/riscv64-unknown-elf-ld
: 'RUN: at line 17';   [ ! -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/riscv64-unknown-elf ] || rm /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/riscv64-unknown-elf
: 'RUN: at line 18';   ln -s /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/clang /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/clang
: 'RUN: at line 19';   ln -s /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/Inputs/basic_riscv64_nogcc_tree/bin/riscv64-unknown-elf-ld /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/riscv64-unknown-elf-ld
: 'RUN: at line 20';   ln -s /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/Inputs/basic_riscv64_nogcc_tree/riscv64-unknown-elf /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/riscv64-unknown-elf
: 'RUN: at line 21';   /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/clang /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv64-toolchain-extra.c -### -no-canonical-prefixes     --gcc-toolchain=/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/invalid     -target riscv64-unknown-elf --rtlib=platform 2>&1     | /b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/FileCheck -check-prefix=C-RV64-BAREMETAL-LP64-NOGCC /b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv64-toolchain-extra.c
--
Exit Code: 1

Command Output (stderr):
--
/b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv64-toolchain-extra.c:27:33: error: C-RV64-BAREMETAL-LP64-NOGCC: expected string not found in input
// C-RV64-BAREMETAL-LP64-NOGCC: "{{.*}}Output/testroot-riscv64-baremetal-nogcc/bin/riscv64-unknown-elf-ld"
                                ^
<stdin>:5:1069: note: scanning from here
 "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/clang" "-cc1" "-triple" "riscv64-unknown-unknown-elf" "-emit-obj" "-mrelax-all" "--mrelax-relocations" "-disable-free" "-disable-llvm-verifier" "-discard-value-names" "-main-file-name" "riscv64-toolchain-extra.c" "-mrelocation-model" "static" "-mthread-model" "posix" "-mframe-pointer=all" "-fmath-errno" "-fno-rounding-math" "-masm-verbose" "-mconstructor-aliases" "-nostdsysteminc" "-target-feature" "+m" "-target-feature" "+a" "-target-feature" "+c" "-target-feature" "+relax" "-target-feature" "-save-restore" "-target-abi" "lp64" "-dwarf-column-info" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/lib/clang/11.0.0" "-internal-isystem" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/../riscv64-unknown-elf/include" "-fdebug-compilation-dir" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver" "-ferror-limit" "19" "-fmessage-length" "0" "-fno-signed-char" "-fgnuc-version=4.2.1" "-fobjc-runtime=gcc" "-fdiagnostics-show-option" "-faddrsig" "-o" "/tmp/riscv64-toolchain-extra-0b21db.o" "-x" "c" "/b/fuchsia-x86_64-linux/llvm.src/clang/test/Driver/riscv64-toolchain-extra.c"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ^
<stdin>:6:169: note: possible intended match here
 "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/bin/ld.lld" "-m" "elf64lriscv" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/../riscv64-unknown-elf/lib/crt0.o" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/lib/clang/11.0.0/lib/clang_rt.crtbegin-riscv64.o" "-L/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/bin/../riscv64-unknown-elf/lib" "/tmp/riscv64-toolchain-extra-0b21db.o" "--start-group" "-lc" "-lgloss" "--end-group" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/lib/clang/11.0.0/lib/libclang_rt.builtins-riscv64.a" "/b/fuchsia-x86_64-linux/llvm.obj/tools/clang/stage2-bins/tools/clang/test/Driver/Output/testroot-riscv64-baremetal-nogcc/lib/clang/11.0.0/lib/clang_rt.crtend-riscv64.o" "-o" "a.out"
                                                                                                                                                                        ^

--

********************
Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 

Testing Time: 44.02s
********************
Failing Tests (2):
    Clang :: Driver/riscv32-toolchain-extra.c
    Clang :: Driver/riscv64-toolchain-extra.c

Could you take a look? Thanks.

Log: http://lab.llvm.org:8011/builders/fuchsia-x86_64-linux/builds/613/steps/check/logs/stdio

leonardchan added a comment.Feb 26 2020, 12:07 PM

Unsure if my reply was sent over email so copying it here.

Yup, adding // REQUIRES: platform-linker to both *-extra.c files seems to fix it. Thanks. Will you be sending out the fix?

leonardchan added a comment.Feb 26 2020, 12:24 PM

Submitted fixes in d2cbaf1755ffa90300365c0d71400a5ee4ada3bd

thakis added a subscriber: thakis.Nov 24 2020, 8:05 PM
thakis added inline comments.
clang/test/lit.site.cfg.py.in
50 ↗(On Diff #246648)

Why do you need this feature? clang invocations that want to use the platform linker can just pass -fuse-ld= or -fuse-ld=ld, no?

Herald added subscribers: frasercrmck, NickHung. · View Herald TranscriptNov 24 2020, 8:05 PM
serge-sans-paille added inline comments.Nov 25 2020, 1:50 AM
clang/test/lit.site.cfg.py.in
50 ↗(On Diff #246648)

I think the RISCV tests are partly responsible from that dubious test: in riscv64-toolchain.c:27 the test explicitly checks for a custom linker path, just like the one passed through -DCLANG_DEFAULT_LINKER. We should probably make this more narrow.

thakis mentioned this in D92291: clang/test: Remove platform-linker feature.Nov 29 2020, 5:24 PM
thakis mentioned this in rG61da501b6a1b: clang/test: Remove platform-linker feature.Nov 30 2020, 5:01 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
4 lines

Diff 244943

clang/lib/Driver/ToolChains/RISCVToolchain.cpp

Show First 20 Lines • Show All 136 Lines • ▼ Show 20 Linesvoid RISCV::Linker::ConstructJob(Compilation &C, const JobAction &JA,
bool IsRV64 = ToolChain.getArch() == llvm::Triple::riscv64; bool IsRV64 = ToolChain.getArch() == llvm::Triple::riscv64;
CmdArgs.push_back("-m"); CmdArgs.push_back("-m");
if (IsRV64) { if (IsRV64) {
CmdArgs.push_back("elf64lriscv"); CmdArgs.push_back("elf64lriscv");
} else { } else {
CmdArgs.push_back("elf32lriscv"); CmdArgs.push_back("elf32lriscv");
} }
std::string Linker = getToolChain().GetProgramPath(getShortName()); std::string Linker = getToolChain().GetLinkerPath();
bool WantCRTs = bool WantCRTs =
!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles); !Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles);
const char *crtbegin, *crtend; const char *crtbegin, *crtend;
auto RuntimeLib = ToolChain.GetRuntimeLibType(Args); auto RuntimeLib = ToolChain.GetRuntimeLibType(Args);
if (RuntimeLib == ToolChain::RLT_Libgcc) { if (RuntimeLib == ToolChain::RLT_Libgcc) {
crtbegin = "crtbegin.o"; crtbegin = "crtbegin.o";
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

clang/test/Driver/riscv32-toolchain.c

// A basic clang -cc1 command-line, and simple environment check. // A basic clang -cc1 command-line, and simple environment check.
// RUN: %clang %s -### -no-canonical-prefixes -target riscv32 2>&1 | FileCheck -check-prefix=CC1 %s // RUN: %clang %s -### -no-canonical-prefixes -target riscv32 2>&1 | FileCheck -check-prefix=CC1 %s
// CC1: clang{{.*}} "-cc1" "-triple" "riscv32" // CC1: clang{{.*}} "-cc1" "-triple" "riscv32"
// Test interaction with -fuse-ld=lld
// RUN: %clang %s -### -no-canonical-prefixes -target riscv32 -fuse-ld=lld 2>&1 | FileCheck -check-prefix=LLD %s
// LLD: ld.lld
// In the below tests, --rtlib=platform is used so that the driver ignores // In the below tests, --rtlib=platform is used so that the driver ignores
// the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib // the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib
// RUN: %clang %s -### -no-canonical-prefixes \ // RUN: %clang %s -### -no-canonical-prefixes \
// RUN: -target riscv32-unknown-elf --rtlib=platform \ // RUN: -target riscv32-unknown-elf --rtlib=platform \
// RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree \ // RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree \
// RUN: --sysroot=%S/Inputs/basic_riscv32_tree/riscv32-unknown-elf 2>&1 \ // RUN: --sysroot=%S/Inputs/basic_riscv32_tree/riscv32-unknown-elf 2>&1 \
// RUN: | FileCheck -check-prefix=C-RV32-BAREMETAL-ILP32 %s // RUN: | FileCheck -check-prefix=C-RV32-BAREMETAL-ILP32 %s
▲ Show 20 Lines • Show All 351 Lines • Show Last 20 Lines