From 8cddf5ade96fc439828f298e71789fb1edcbc1d6 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 14 Oct 2016 18:20:12 +0000 Subject: [PATCH] Revert r284256 due to test failure git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@284259 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 4 ---- test/Driver/openbsd.c | 23 ----------------------- 2 files changed, 27 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index e073eddc36..b7a323faa5 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -8519,10 +8519,6 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, 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"))); diff --git a/test/Driver/openbsd.c b/test/Driver/openbsd.c index ff54f39215..95b9e6ad4f 100644 --- a/test/Driver/openbsd.c +++ b/test/Driver/openbsd.c @@ -67,26 +67,3 @@ // 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-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" -- 2.40.0