Commit b1c89d22 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r345470: 

------------------------------------------------------------------------
r345470 | brad | 2018-10-27 20:30:18 -0700 (Sat, 27 Oct 2018) | 2 lines

Reapply Pass the nopie flag to the linker when linking with -pg.

------------------------------------------------------------------------

llvm-svn: 348405
parent d363502d

clang/lib/Driver/ToolChains/OpenBSD.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, 


  if (Args.hasArg(options::OPT_pie))

    CmdArgs.push_back("-pie");

  if (Args.hasArg(options::OPT_nopie))

  if (Args.hasArg(options::OPT_nopie) || Args.hasArg(options::OPT_pg))

    CmdArgs.push_back("-nopie");



  if (Output.isFilename()) {

clang/test/Driver/openbsd.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -pg -pthread %s -### 2>&1 \

// RUN:   | FileCheck --check-prefix=CHECK-PG %s

// CHECK-PG: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd"

// CHECK-PG: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-o" "a.out" "{{.*}}gcrt0.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-lgcc" "-lpthread_p" "-lc_p" "-lgcc" "{{.*}}crtend.o"

// CHECK-PG: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-nopie" "-o" "a.out" "{{.*}}gcrt0.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-lgcc" "-lpthread_p" "-lc_p" "-lgcc" "{{.*}}crtend.o"



// Check CPU type for MIPS64

// RUN: %clang -target mips64-unknown-openbsd -### -c %s 2>&1 \