This is an archive of the discontinued LLVM Phabricator instance.

Differential D44229

Don't use -pie in relocatable link.
ClosedPublic

Authored by eugenis on Mar 7 2018, 3:04 PM.

Details

Reviewers
srhines
Commits
rGd48c0cd9106b: Don't use -pie in relocatable link.
rL327165: Don't use -pie in relocatable link.
rC327165: Don't use -pie in relocatable link.
Summary

Android, in particular, got PIE enabled by default in r316606. It resulted in
relocatable links passing both -r and -pie to the linker, which is not allowed.

Diff Detail

Repository
rC Clang

Event Timeline

eugenis created this revision.Mar 7 2018, 3:04 PM
Harbormaster completed remote builds in B15808: Diff 137493.Mar 7 2018, 3:06 PM
srhines accepted this revision.Mar 7 2018, 3:06 PM

Thanks for fixing this quickly. :)

This revision is now accepted and ready to land.Mar 7 2018, 3:06 PM
mgrang added a subscriber: mgrang.Mar 7 2018, 3:07 PM
mgrang added inline comments.
clang/lib/Driver/ToolChains/Gnu.cpp
311 ↗(On Diff #137493)

We also need to check for -Wl,-r and -Xlinker -r options.

eugenis added inline comments.Mar 7 2018, 3:41 PM
clang/lib/Driver/ToolChains/Gnu.cpp
311 ↗(On Diff #137493)

I don't think it is driver's job to parse -Wl or -Xlinker arguments.
There is always -no-pie.

Closed by commit rC327165: Don't use -pie in relocatable link. (authored by eugenis). · Explain WhyMar 9 2018, 11:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Driver/
ToolChains/
3 lines
test/
Driver/
17 lines

Diff 137809

lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 301 Lines • ▼ Show 20 Lines if (T.getEnvironment() == llvm::Triple::GNUX32)
return "elf32_x86_64"; return "elf32_x86_64";
return "elf_x86_64"; return "elf_x86_64";
default: default:
return nullptr; return nullptr;
} }
} }
static bool getPIE(const ArgList &Args, const toolchains::Linux &ToolChain) { static bool getPIE(const ArgList &Args, const toolchains::Linux &ToolChain) {
if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_static)) if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_static) ||
Args.hasArg(options::OPT_r))
return false; return false;
Arg *A = Args.getLastArg(options::OPT_pie, options::OPT_no_pie, Arg *A = Args.getLastArg(options::OPT_pie, options::OPT_no_pie,
options::OPT_nopie); options::OPT_nopie);
if (!A) if (!A)
return ToolChain.isPIEDefault(); return ToolChain.isPIEDefault();
return A->getOption().matches(options::OPT_pie); return A->getOption().matches(options::OPT_pie);
} }
▲ Show 20 Lines • Show All 2,175 Lines • Show Last 20 Lines

test/Driver/android-pie.c

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
// RUN: | FileCheck --check-prefix=PIE %s // RUN: | FileCheck --check-prefix=PIE %s
// RUN: %clang %s -### -o %t.o 2>&1 -no-pie --target=arm-linux-androideabi24 \ // RUN: %clang %s -### -o %t.o 2>&1 -no-pie --target=arm-linux-androideabi24 \
// RUN: | FileCheck --check-prefix=NO-PIE %s // RUN: | FileCheck --check-prefix=NO-PIE %s
// RUN: %clang %s -### -o %t.o 2>&1 -nopie --target=arm-linux-androideabi24 \ // RUN: %clang %s -### -o %t.o 2>&1 -nopie --target=arm-linux-androideabi24 \
// RUN: | FileCheck --check-prefix=NO-PIE %s // RUN: | FileCheck --check-prefix=NO-PIE %s
// RUN: %clang %s -### -o %t.o 2>&1 -pie -no-pie --target=arm-linux-androideabi24 \ // RUN: %clang %s -### -o %t.o 2>&1 -pie -no-pie --target=arm-linux-androideabi24 \
// RUN: | FileCheck --check-prefix=NO-PIE %s // RUN: | FileCheck --check-prefix=NO-PIE %s
// Static/shared/relocatable disable -pie
// RUN: %clang %s -### --target=aarch64-linux-android -static 2>&1 \
// RUN: | FileCheck %s -check-prefix=CHECK-STATIC
// CHECK-STATIC-NOT: "-pie"
// CHECK-STATIC: -static
// RUN: %clang %s -### --target=aarch64-linux-android -shared 2>&1 \
// RUN: | FileCheck %s -check-prefix=CHECK-SHARED
// CHECK-SHARED-NOT: "-pie"
// CHECK-SHARED: "-shared"
// RUN: %clang %s -### --target=aarch64-linux-android -r 2>&1 \
// RUN: | FileCheck %s -check-prefix=CHECK-RELOCATABLE
// CHECK-RELOCATABLE-NOT: "-pie"
// CHECK-RELOCATABLE: "-r"