[llvm-branch-commits] [llvm-branch] r360950 - Merging r355038:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu May 16 15:49:01 2019
New Revision: 360950

URL: http://llvm.org/viewvc/llvm-project?rev=360950&view=rev
Log:
Merging r355038:

------------------------------------------------------------------------
r355038 | joerg | 2019-02-27 13:53:14 -0800 (Wed, 27 Feb 2019) | 3 lines

Default to Secure PLT on PPC for NetBSD and OpenBSD.
This matches the default settings of clang.

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

Modified:
    llvm/branches/release_80/lib/Target/PowerPC/PPCSubtarget.cpp
    llvm/branches/release_80/test/CodeGen/PowerPC/ppc32-pic-large.ll

Modified: llvm/branches/release_80/lib/Target/PowerPC/PPCSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/lib/Target/PowerPC/PPCSubtarget.cpp?rev=360950&r1=360949&r2=360950&view=diff
==============================================================================
--- llvm/branches/release_80/lib/Target/PowerPC/PPCSubtarget.cpp (original)
+++ llvm/branches/release_80/lib/Target/PowerPC/PPCSubtarget.cpp Thu May 16 15:49:01 2019
@@ -138,6 +138,9 @@ void PPCSubtarget::initSubtargetFeatures
   if (isDarwin())
     HasLazyResolverStubs = true;
 
+  if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD())
+    SecurePlt = true;
+
   if (HasSPE && IsPPC64)
     report_fatal_error( "SPE is only supported for 32-bit targets.\n", false);
   if (HasSPE && (HasAltivec || HasQPX || HasVSX || HasFPU))

Modified: llvm/branches/release_80/test/CodeGen/PowerPC/ppc32-pic-large.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/test/CodeGen/PowerPC/ppc32-pic-large.ll?rev=360950&r1=360949&r2=360950&view=diff
==============================================================================
--- llvm/branches/release_80/test/CodeGen/PowerPC/ppc32-pic-large.ll (original)
+++ llvm/branches/release_80/test/CodeGen/PowerPC/ppc32-pic-large.ll Thu May 16 15:49:01 2019
@@ -1,5 +1,9 @@
 ; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -relocation-model=pic | FileCheck -check-prefix=LARGE-BSS %s
 ; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -mattr=+secure-plt -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
+; RUN: llc < %s -mtriple=powerpc-unknown-netbsd -mattr=+secure-plt -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
+; RUN: llc < %s -mtriple=powerpc-unknown-netbsd -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
+; RUN: llc < %s -mtriple=powerpc-unknown-openbsd -mattr=+secure-plt -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
+; RUN: llc < %s -mtriple=powerpc-unknown-openbsd -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
 @bar = common global i32 0, align 4
 
 declare i32 @call_foo(i32, ...)