summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 21:12:06 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 21:12:06 +0000
commita1571659573d93f12ad419528a789cfd5574f31f (patch)
treeb4ffb87fe16f9a49c7abffb3c89c04139552c07d /lib/libssl
parent567cbc2bb44ed7a2c477b0787d4ccd50e8ebecf2 (diff)
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@
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/src/crypto/perlasm/x86gas.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/perlasm/x86gas.pl b/lib/libssl/src/crypto/perlasm/x86gas.pl
index 15e17f25d05..9a1cce026ea 100644
--- a/lib/libssl/src/crypto/perlasm/x86gas.pl
+++ b/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");