This is an archive of the discontinued LLVM Phabricator instance.

Differential D22130

Link static PIE programs against rcrt0.o on OpenBSD
ClosedPublic

Authored by sisnkemp on Jul 8 2016, 5:37 AM.

Details

Reviewers
emaste
joerg
Commits
rGaaa44fe5cd37: Link static PIE programs against rcrt0.o on OpenBSD
rC284256: Link static PIE programs against rcrt0.o on OpenBSD
rL284256: Link static PIE programs against rcrt0.o on OpenBSD
Summary

When building a static PIE binary, linking against /usr/lib/crt0.o results in segfaults when trying to run the binary.
Static PIE programs must link against /usr/lib/rcrt0.o instead to run correctly. Bitrig has this patch in their local clang tree also.

Diff Detail

Repository
rL LLVM

Event Timeline

sisnkemp updated this revision to Diff 63205.Jul 8 2016, 5:37 AM
sisnkemp retitled this revision from to Link static PIE programs against rcrt0.o on OpenBSD.
sisnkemp updated this object.
sisnkemp added a reviewer: • rafael.
sisnkemp added a subscriber: cfe-commits.
• rafael edited reviewers, added: emaste; removed: • rafael.Jul 8 2016, 5:41 AM
sisnkemp added a comment.Aug 9 2016, 11:02 AM

Ping?

sisnkemp added reviewers: vsk, joerg.Aug 13 2016, 7:14 AM
joerg edited edge metadata.Aug 13 2016, 11:49 AM

This is missing a test case.

sisnkemp updated this revision to Diff 68046.Aug 15 2016, 9:33 AM
sisnkemp edited edge metadata.

Now with test case.

sisnkemp added a comment.Sep 5 2016, 10:51 AM

Ping?

vsk resigned from this revision.Sep 6 2016, 6:48 AM
vsk removed a reviewer: vsk.

I don't see any issues with this patch, but also don't know enough about the openbsd toolchain to lgtm it.

emaste edited edge metadata.Sep 8 2016, 7:26 AM

Seems fine to me, but I'm not particularly knowledgeable about OpenBSD's toolchain.

joerg accepted this revision.Oct 13 2016, 4:44 PM
joerg edited edge metadata.
This revision is now accepted and ready to land.Oct 13 2016, 4:44 PM
Closed by commit rL284256: Link static PIE programs against rcrt0.o on OpenBSD (authored by emaste). · Explain WhyOct 14 2016, 11:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
4 lines
test/
Driver/
23 lines

Diff 74718

cfe/trunk/lib/Driver/Tools.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 8,513 Lines • ▼ Show 20 Lines if (Output.isFilename()) {
assert(Output.isNothing() && "Invalid output."); assert(Output.isNothing() && "Invalid output.");
} }
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) { if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
if (!Args.hasArg(options::OPT_shared)) { if (!Args.hasArg(options::OPT_shared)) {
if (Args.hasArg(options::OPT_pg)) if (Args.hasArg(options::OPT_pg))
CmdArgs.push_back( CmdArgs.push_back(
Args.MakeArgString(getToolChain().GetFilePath("gcrt0.o"))); Args.MakeArgString(getToolChain().GetFilePath("gcrt0.o")));
else if (Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_nopie))
CmdArgs.push_back(
Args.MakeArgString(getToolChain().GetFilePath("rcrt0.o")));
else else
CmdArgs.push_back( CmdArgs.push_back(
Args.MakeArgString(getToolChain().GetFilePath("crt0.o"))); Args.MakeArgString(getToolChain().GetFilePath("crt0.o")));
CmdArgs.push_back( CmdArgs.push_back(
Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o"))); Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o")));
} else { } else {
CmdArgs.push_back( CmdArgs.push_back(
Args.MakeArgString(getToolChain().GetFilePath("crtbeginS.o"))); Args.MakeArgString(getToolChain().GetFilePath("crtbeginS.o")));
▲ Show 20 Lines • Show All 3,221 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/openbsd.c

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
// CHECK-AMD64-M32: as{{.*}}" "--32" // CHECK-AMD64-M32: as{{.*}}" "--32"
// CHECK-POWERPC: as{{.*}}" "-mppc" "-many" // CHECK-POWERPC: as{{.*}}" "-mppc" "-many"
// CHECK-SPARC: as{{.*}}" "-32" "-Av8" // CHECK-SPARC: as{{.*}}" "-32" "-Av8"
// CHECK-SPARC64: as{{.*}}" "-64" "-Av9" // CHECK-SPARC64: as{{.*}}" "-64" "-Av9"
// CHECK-MIPS64: as{{.*}}" "-mabi" "64" "-EB" // CHECK-MIPS64: as{{.*}}" "-mabi" "64" "-EB"
// CHECK-MIPS64-PIC: as{{.*}}" "-mabi" "64" "-EB" "-KPIC" // CHECK-MIPS64-PIC: as{{.*}}" "-mabi" "64" "-EB" "-KPIC"
// CHECK-MIPS64EL: as{{.*}}" "-mabi" "64" "-EL" // CHECK-MIPS64EL: as{{.*}}" "-mabi" "64" "-EL"
// CHECK-MIPS64EL-PIC: as{{.*}}" "-mabi" "64" "-EL" "-KPIC" // CHECK-MIPS64EL-PIC: as{{.*}}" "-mabi" "64" "-EL" "-KPIC"
// Check linking against correct startup code when (not) using PIE
// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-PIE %s
// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd %s -fno-pie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-PIE %s
// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -static %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-STATIC-PIE %s
// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -static -fno-pie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-STATIC-PIE %s
// RUN: %clang -no-canonical-prefix -target i868-pc-openbsd -nopie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s
// RUN: %clang -no-canonical-prefix -target i868-pc-openbsd -fno-pie -nopie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s
// RUN: %clang -no-canonical-prefix -target i868-pc-openbsd -static -nopie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s
// RUN: %clang -no-canonical-prefix -target i868-pc-openbsd -fno-pie -static -nopie %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s
// CHECK-PIE: "/usr/lib/crt0.o"
// CHECK-PIE-NOT: "-nopie"
// CHECK-STATIC-PIE: "/usr/lib/rcrt0.o"
// CHECK-STATIC-PIE-NOT: "-nopie"
// CHECK-NOPIE: "-nopie" {{.*}}"/usr/lib/crt0.o"