Commit d14b74f6 authored by Brad Smith's avatar Brad Smith
Browse files

Merging r299269: 

------------------------------------------------------------------------
r299269 | brad | 2017-03-31 18:13:17 -0400 (Fri, 31 Mar 2017) | 2 lines

Add/update PIE defaults for OpenBSD.
------------------------------------------------------------------------

llvm-svn: 301087
parent dabd1af0

clang/lib/Driver/Tools.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3851,9 +3851,10 @@ ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) { 
  // OpenBSD-specific defaults for PIE

  if (Triple.getOS() == llvm::Triple::OpenBSD) {

    switch (ToolChain.getArch()) {

    case llvm::Triple::arm:

    case llvm::Triple::aarch64:

    case llvm::Triple::mips64:

    case llvm::Triple::mips64el:

    case llvm::Triple::sparcel:

    case llvm::Triple::x86:

    case llvm::Triple::x86_64:

      IsPICLevelTwo = false; // "-fpie"
@@ -3861,6 +3862,7 @@ ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) { 


    case llvm::Triple::ppc:

    case llvm::Triple::sparc:

    case llvm::Triple::sparcel:

    case llvm::Triple::sparcv9:

      IsPICLevelTwo = true; // "-fPIE"

      break;

clang/test/Driver/pic.c

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ 
// RUN:   | FileCheck %s --check-prefix=CHECK-PIE1

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

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

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

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

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

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

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

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

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