Commit 8abd5fe4 authored by Brad Smith's avatar Brad Smith
Browse files

Merging r295614: 

------------------------------------------------------------------------
r295614 | brad | 2017-02-19 15:11:48 -0500 (Sun, 19 Feb 2017) | 2 lines

Always use --eh-frame-hdr on OpenBSD, even for -static
------------------------------------------------------------------------

llvm-svn: 301083
parent 200fcffe

clang/lib/Driver/Tools.cpp

+1 −1
Original line number Diff line number Diff line
@@ -8907,12 +8907,12 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, 
    CmdArgs.push_back("__start");

  }



  CmdArgs.push_back("--eh-frame-hdr");

  if (Args.hasArg(options::OPT_static)) {

    CmdArgs.push_back("-Bstatic");

  } else {

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

      CmdArgs.push_back("-export-dynamic");

    CmdArgs.push_back("--eh-frame-hdr");

    CmdArgs.push_back("-Bdynamic");

    if (Args.hasArg(options::OPT_shared)) {

      CmdArgs.push_back("-shared");

clang/test/Driver/openbsd.c

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ 
// CHECK-LD: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd"

// CHECK-LD: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-o" "a.out" "{{.*}}crt0.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-lgcc" "-lc" "-lgcc" "{{.*}}crtend.o"



// Check for --eh-frame-hdr being passed with static linking

// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd -static %s -### 2>&1 \

// RUN:   | FileCheck --check-prefix=CHECK-LD-STATIC-EH %s

// CHECK-LD-STATIC-EH: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd"

// CHECK-LD-STATIC-EH: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bstatic" "-o" "a.out" "{{.*}}rcrt0.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-lgcc" "-lc" "-lgcc" "{{.*}}crtend.o"



// 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"