This is an archive of the discontinued LLVM Phabricator instance.

Differential D118942

[Driver][Android] Removed obsoleted --warn-shared-textrel
ClosedPublic

Authored by MaskRay on Feb 3 2022, 1:11 PM.

Details

Reviewers
danalbert
srhines
Commits
rG679c77ede35a: [Driver][Android] Removed obsoleted --warn-shared-textrel
Summary

--warn-shared-textrel is ignored in ld.lld and obsoleted in GNU ld
(https://sourceware.org/bugzilla/show_bug.cgi?id=22909).

Note: binutils can be configured with --enable-textrel-check=[yes|error]
to make GNU ld error for text relocations by default, like ld.lld.

Diff Detail

Event Timeline

MaskRay created this revision.Feb 3 2022, 1:11 PM
Herald added a subscriber: danielkiss. · View Herald TranscriptFeb 3 2022, 1:11 PM
MaskRay requested review of this revision.Feb 3 2022, 1:11 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 3 2022, 1:11 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B147481: Diff 405760.Feb 3 2022, 2:32 PM
srhines accepted this revision.Feb 3 2022, 3:02 PM
This revision is now accepted and ready to land.Feb 3 2022, 3:02 PM
This revision was landed with ongoing or failed builds.Feb 4 2022, 9:30 AM
Closed by commit rG679c77ede35a: [Driver][Android] Removed obsoleted --warn-shared-textrel (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rG679c77ede35a: [Driver][Android] Removed obsoleted --warn-shared-textrel.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
5 lines
test/
Driver/
6 lines

Diff 406004

clang/lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 445 Lines • ▼ Show 20 Linesvoid tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
// Most Android ARM64 targets should enable the linker fix for erratum // Most Android ARM64 targets should enable the linker fix for erratum
// 843419. Only non-Cortex-A53 devices are allowed to skip this flag. // 843419. Only non-Cortex-A53 devices are allowed to skip this flag.
if (Arch == llvm::Triple::aarch64 && isAndroid) { if (Arch == llvm::Triple::aarch64 && isAndroid) {
std::string CPU = getCPUName(D, Args, Triple); std::string CPU = getCPUName(D, Args, Triple);
if (CPU.empty() || CPU == "generic" || CPU == "cortex-a53") if (CPU.empty() || CPU == "generic" || CPU == "cortex-a53")
CmdArgs.push_back("--fix-cortex-a53-843419"); CmdArgs.push_back("--fix-cortex-a53-843419");
} }
// Android does not allow shared text relocations. Emit a warning if the
// user's code contains any.
if (isAndroid)
CmdArgs.push_back("--warn-shared-textrel");
ToolChain.addExtraOpts(CmdArgs); ToolChain.addExtraOpts(CmdArgs);
CmdArgs.push_back("--eh-frame-hdr"); CmdArgs.push_back("--eh-frame-hdr");
if (const char *LDMOption = getLDMOption(ToolChain.getTriple(), Args)) { if (const char *LDMOption = getLDMOption(ToolChain.getTriple(), Args)) {
CmdArgs.push_back("-m"); CmdArgs.push_back("-m");
CmdArgs.push_back(LDMOption); CmdArgs.push_back(LDMOption);
} else { } else {
▲ Show 20 Lines • Show All 2,606 Lines • Show Last 20 Lines

clang/test/Driver/linux-ld.c

Show First 20 Lines • Show All 983 Lines • ▼ Show 20 Lines
// CHECK-ANDROID-HASH-STYLE-L: "--hash-style=both" // CHECK-ANDROID-HASH-STYLE-L: "--hash-style=both"
// //
// RUN: %clang %s -### -o %t.o 2>&1 \ // RUN: %clang %s -### -o %t.o 2>&1 \
// RUN: --target=armv7-linux-android23 \ // RUN: --target=armv7-linux-android23 \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-HASH-STYLE-M %s // RUN: | FileCheck --check-prefix=CHECK-ANDROID-HASH-STYLE-M %s
// CHECK-ANDROID-HASH-STYLE-M: "{{.*}}ld{{(.exe)?}}" // CHECK-ANDROID-HASH-STYLE-M: "{{.*}}ld{{(.exe)?}}"
// CHECK-ANDROID-HASH-STYLE-M: "--hash-style=gnu" // CHECK-ANDROID-HASH-STYLE-M: "--hash-style=gnu"
// RUN: %clang %s -### -o %t.o 2>&1 \
// RUN: --target=armv7-linux-android21 \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-WARN-SHARED-TEXTREL %s
// CHECK-ANDROID-WARN-SHARED-TEXTREL: "{{.*}}ld{{(.exe)?}}"
// CHECK-ANDROID-WARN-SHARED-TEXTREL: "--warn-shared-textrel"
// RUN: %clang %s -### -o %t.o 2>&1 --target=mips64-linux-gnuabin32 \ // RUN: %clang %s -### -o %t.o 2>&1 --target=mips64-linux-gnuabin32 \
// RUN: | FileCheck --check-prefix=CHECK-MIPS64EL-GNUABIN32 %s // RUN: | FileCheck --check-prefix=CHECK-MIPS64EL-GNUABIN32 %s
// CHECK-MIPS64EL-GNUABIN32: "{{.*}}ld{{(.exe)?}}" // CHECK-MIPS64EL-GNUABIN32: "{{.*}}ld{{(.exe)?}}"
// CHECK-MIPS64EL-GNUABIN32: "-m" "elf32btsmipn32" // CHECK-MIPS64EL-GNUABIN32: "-m" "elf32btsmipn32"
// CHECK-MIPS64EL-GNUABIN32: "-dynamic-linker" "{{.*}}/lib{{(32)?}}/ld.so.1" // CHECK-MIPS64EL-GNUABIN32: "-dynamic-linker" "{{.*}}/lib{{(32)?}}/ld.so.1"
// CHECK-MIPS64EL-GNUABIN32-NOT: "--hash-style={{gnu|both}}" // CHECK-MIPS64EL-GNUABIN32-NOT: "--hash-style={{gnu|both}}"
// //
// RUN: %clang %s -### -o %t.o 2>&1 --target=mips64-linux-gnuabi64 \ // RUN: %clang %s -### -o %t.o 2>&1 --target=mips64-linux-gnuabi64 \
▲ Show 20 Lines • Show All 892 Lines • Show Last 20 Lines