Merged to 4.0 in r295752 as requested in PR32013.
On Sun, Feb 19, 2017 at 11:33 AM, Brad Smith via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: brad > Date: Sun Feb 19 13:33:26 2017 > New Revision: 295610 > > URL: http://llvm.org/viewvc/llvm-project?rev=295610&view=rev > Log: > Link static PIE programs against rcrt0.o on OpenBSD > > Patch by Stefan Kempf. > > Modified: > cfe/trunk/lib/Driver/Tools.cpp > cfe/trunk/test/Driver/openbsd.c > > Modified: cfe/trunk/lib/Driver/Tools.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=295610&r1=295609&r2=295610&view=diff > ============================================================================== > --- cfe/trunk/lib/Driver/Tools.cpp (original) > +++ cfe/trunk/lib/Driver/Tools.cpp Sun Feb 19 13:33:26 2017 > @@ -9035,6 +9035,10 @@ void openbsd::Linker::ConstructJob(Compi > if (Args.hasArg(options::OPT_pg)) > CmdArgs.push_back( > 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 > CmdArgs.push_back( > Args.MakeArgString(getToolChain().GetFilePath("crt0.o"))); > > Modified: cfe/trunk/test/Driver/openbsd.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/openbsd.c?rev=295610&r1=295609&r2=295610&view=diff > ============================================================================== > --- cfe/trunk/test/Driver/openbsd.c (original) > +++ cfe/trunk/test/Driver/openbsd.c Sun Feb 19 13:33:26 2017 > @@ -67,3 +67,26 @@ > // CHECK-MIPS64-PIC: as{{.*}}" "-mabi" "64" "-EB" "-KPIC" > // CHECK-MIPS64EL: as{{.*}}" "-mabi" "64" "-EL" > // 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-prefixes -target i686-pc-openbsd -nopie %s -### > 2>&1 \ > +// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s > +// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -fno-pie > -nopie %s -### 2>&1 \ > +// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s > +// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -static -nopie > %s -### 2>&1 \ > +// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s > +// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -fno-pie > -static -nopie %s -### 2>&1 \ > +// RUN: | FileCheck -check-prefix=CHECK-NOPIE %s > +// CHECK-PIE: "{{.*}}crt0.o" > +// CHECK-PIE-NOT: "-nopie" > +// CHECK-STATIC-PIE: "{{.*}}rcrt0.o" > +// CHECK-STATIC-PIE-NOT: "-nopie" > +// CHECK-NOPIE: "-nopie" "{{.*}}crt0.o" > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits