Author: brad Date: Sat Apr 22 12:20:27 2017 New Revision: 301087 URL: http://llvm.org/viewvc/llvm-project?rev=301087&view=rev Log: Merging r299269:
------------------------------------------------------------------------ r299269 | brad | 2017-03-31 18:13:17 -0400 (Fri, 31 Mar 2017) | 2 lines Add/update PIE defaults for OpenBSD. ------------------------------------------------------------------------ Modified: cfe/branches/release_40/lib/Driver/Tools.cpp cfe/branches/release_40/test/Driver/pic.c Modified: cfe/branches/release_40/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Driver/Tools.cpp?rev=301087&r1=301086&r2=301087&view=diff ============================================================================== --- cfe/branches/release_40/lib/Driver/Tools.cpp (original) +++ cfe/branches/release_40/lib/Driver/Tools.cpp Sat Apr 22 12:20:27 2017 @@ -3851,9 +3851,10 @@ ParsePICArgs(const ToolChain &ToolChain, // 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, case llvm::Triple::ppc: case llvm::Triple::sparc: + case llvm::Triple::sparcel: case llvm::Triple::sparcv9: IsPICLevelTwo = true; // "-fPIE" break; Modified: cfe/branches/release_40/test/Driver/pic.c URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Driver/pic.c?rev=301087&r1=301086&r2=301087&view=diff ============================================================================== --- cfe/branches/release_40/test/Driver/pic.c (original) +++ cfe/branches/release_40/test/Driver/pic.c Sat Apr 22 12:20:27 2017 @@ -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 \ _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits