From dd5090d7a54ea16ff78b52384145bf545d749762 Mon Sep 17 00:00:00 2001
From: pascal <>
Date: Tue, 21 Aug 2012 21:12:05 +0000
Subject: When deciding whether we're PIC in a (generated) asm file, check for
 both PIC and __PIC__ defines.  Makes things easier for PIE.

ok djm@
---
 src/lib/libcrypto/perlasm/x86gas.pl         | 2 +-
 src/lib/libssl/src/crypto/perlasm/x86gas.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/perlasm/x86gas.pl b/src/lib/libcrypto/perlasm/x86gas.pl
index 15e17f25d0..9a1cce026e 100644
--- a/src/lib/libcrypto/perlasm/x86gas.pl
+++ b/src/lib/libcrypto/perlasm/x86gas.pl
@@ -181,7 +181,7 @@ sub ::picmeup
 { my($dst,$sym,$base,$reflabel)=@_;
 
     if ($::openbsd)
-    {  &::emitraw("#ifdef PIC");
+    {  &::emitraw("#if defined(PIC) || defined(__PIC__)");
        &::emitraw("PIC_PROLOGUE");
        &::mov($dst, &::DWP("PIC_GOT($sym)"));
        &::emitraw("PIC_EPILOGUE");
diff --git a/src/lib/libssl/src/crypto/perlasm/x86gas.pl b/src/lib/libssl/src/crypto/perlasm/x86gas.pl
index 15e17f25d0..9a1cce026e 100644
--- a/src/lib/libssl/src/crypto/perlasm/x86gas.pl
+++ b/src/lib/libssl/src/crypto/perlasm/x86gas.pl
@@ -181,7 +181,7 @@ sub ::picmeup
 { my($dst,$sym,$base,$reflabel)=@_;
 
     if ($::openbsd)
-    {  &::emitraw("#ifdef PIC");
+    {  &::emitraw("#if defined(PIC) || defined(__PIC__)");
        &::emitraw("PIC_PROLOGUE");
        &::mov($dst, &::DWP("PIC_GOT($sym)"));
        &::emitraw("PIC_EPILOGUE");
-- 
cgit v1.2.3-55-g6feb