This is an archive of the discontinued LLVM Phabricator instance.

Differential D151195

[Driver] Fix test for use of ld from devtoolset
ClosedPublic

Authored by nikic on May 23 2023, 2:48 AM.

Details

Reviewers
tstellar
Commits
rG75cce50fd2d3: [Driver] Fix test for use of ld from devtoolset (NFC)
Summary

The test added in https://github.com/llvm/llvm-project/commit/c5fe10f365247c3dd9416b7ec8bad73a60b5946e contains some typos in the check lines, due to which it never actually verified what was intended.

Fix the test by adding the required input tree and adjusting the check lines appropriately.

Diff Detail

Event Timeline

nikic created this revision.May 23 2023, 2:48 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2023, 2:48 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
nikic requested review of this revision.May 23 2023, 2:48 AM
tstellar accepted this revision.May 23 2023, 3:09 AM

LGTM.

This revision is now accepted and ready to land.May 23 2023, 3:09 AM
Harbormaster completed remote builds in B233817: Diff 524631.May 23 2023, 3:48 AM
Closed by commit rG75cce50fd2d3: [Driver] Fix test for use of ld from devtoolset (NFC) (authored by nikic). · Explain WhyMay 23 2023, 4:53 AM
This revision was automatically updated to reflect the committed changes.
nikic added a commit: rG75cce50fd2d3: [Driver] Fix test for use of ld from devtoolset (NFC).
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2023, 4:53 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
test/
Driver/
Inputs/
rhel_7_tree/
opt/
rh/
devtoolset-7/
root/
usr/
bin/
lib/
gcc/
x86_64-redhat-linux/
7/
7 lines

Diff 524657

clang/test/Driver/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root/usr/bin/ld

  • This file was added.
PropertyOld ValueNew Value
File Modenull100755
This is an empty file.

clang/test/Driver/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o

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

clang/test/Driver/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/crtend.o

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

clang/test/Driver/linux-ld.c

Show First 20 Lines • Show All 1,788 Lines • ▼ Show 20 Lines
// CHECK-LD-GENTOO-X32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/../../../../x86_64-pc-linux-gnu/lib" // CHECK-LD-GENTOO-X32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/../../../../x86_64-pc-linux-gnu/lib"
// CHECK-LD-GENTOO-X32: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" // CHECK-LD-GENTOO-X32: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
// CHECK-LD-GENTOO-X32: "-lc" // CHECK-LD-GENTOO-X32: "-lc"
// CHECK-LD-GENTOO-X32: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" // CHECK-LD-GENTOO-X32: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: %clang -### %s -no-pie 2>&1 \
// RUN: --target=x86_64-unknown-linux-gnu \ // RUN: --target=x86_64-unknown-linux-gnu \
// RUN: --gcc-toolchain="%S/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root/usr" \ // RUN: --gcc-toolchain="%S/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root/usr" \
// RUN: --sysroot=%S/Inputs/rhel_7_tree \ // RUN: --sysroot="%S/Inputs/rhel_7_tree/opt/rh/devtoolset-7/root" \
// RUN: | FileCheck --check-prefix=CHECK-LD-RHEL7-DTS %s // RUN: | FileCheck --check-prefix=CHECK-LD-RHEL7-DTS %s
// CHECK-LD-RHEL7-DTS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-LD-RHEL7-DTS: "-isysroot" "[[SYSROOT:[^"]+]]"
// CHECK-LD-RHLE7-DTS: Selected GCC installation: [[GCC_INSTALL:[[SYSROOT]]/lib/gcc/x86_64-redhat-linux/7]]
// CHECK-LD-RHEL7-DTS-NOT: /usr/bin/ld // CHECK-LD-RHEL7-DTS-NOT: /usr/bin/ld
// CHECK-LD-RHLE7-DTS: [[GCC_INSTALL]/../../../bin/ld // CHECK-LD-RHEL7-DTS: [[SYSROOT]]/usr/lib/gcc/x86_64-redhat-linux/7/../../../../bin/ld
// Check whether gcc7 install works fine on Amazon Linux AMI // Check whether gcc7 install works fine on Amazon Linux AMI
// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: %clang -### %s -no-pie 2>&1 \
// RUN: --target=x86_64-amazon-linux -rtlib=libgcc --unwindlib=platform \ // RUN: --target=x86_64-amazon-linux -rtlib=libgcc --unwindlib=platform \
// RUN: --gcc-toolchain="" \ // RUN: --gcc-toolchain="" \
// RUN: --sysroot=%S/Inputs/ami_linux_tree \ // RUN: --sysroot=%S/Inputs/ami_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-LD-AMI %s // RUN: | FileCheck --check-prefix=CHECK-LD-AMI %s
// CHECK-LD-AMI-NOT: warning: // CHECK-LD-AMI-NOT: warning:
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines