1 files changed, 70 insertions, 22 deletions

diff --git a/src/lib/libcrypto/perlasm/x86gas.pl b/src/lib/libcrypto/perlasm/x86gas.pl
index ca644ba553..f28a590549 100644
--- a/src/lib/libcrypto/perlasm/x86gas.pl
+++ b/src/lib/libcrypto/perlasm/x86gas.pl
@@ -177,34 +177,52 @@ sub ::align
     push(@out,".align\t$val\n");
 }
 
-sub ::picmeup
-{ my($dst,$sym,$base,$reflabel)=@_;
-
-    if ($::openbsd)
-    {  &::emitraw("#if defined(PIC) || defined(__PIC__)");
-       &::emitraw("PIC_PROLOGUE");
-       &::mov($dst, &::DWP("PIC_GOT($sym)"));
-       &::emitraw("PIC_EPILOGUE");
-       &::emitraw("#else /* PIC */");
-       &::lea($dst,&::DWP($sym));
-       &::emitraw("#endif /* PIC */");
-    }
-    elsif (($::pic && ($::elf || $::aout)) || $::macosx)
-    {   if (!defined($base))
-        {   &::call(&::label("PIC_me_up"));
-            &::set_label("PIC_me_up");
-            &::blindpop($dst);
-            $base=$dst;
-            $reflabel=&::label("PIC_me_up");
-        }
+#
+# PIC data access wrappers
+#
+# Usage:
+#   picsetup($base)
+#       - only allowed once per function (because of hardcoded label name),
+#         sets up pic access, uses $base register as temporary
+#   picsymbol($dst, $sym, $base)
+#       - loads the address of symbol $sym into $dst with the help of $base
+#         initialized by picsetup
+#   picadjust($sym, $base)
+#       - adjusts a code pointer read from a code_sym table with the help of
+#         $base initialized by picsetup
+#   code_sym($sym)
+#       - emits a pointer to the given code symbol, relative to the GOT if
+#         PIC. This pointer will need to be adjusted with picadjust above
+#         before use.
+
+sub ::picsetup
+{ my($base)=@_;
+
+    if (($::pic && ($::openbsd || $::elf || $::aout)) || $::macosx)
+    {
+        &::call(&::label("PIC_setup"));
+        &::set_label("PIC_setup");
+        &::blindpop($base);
         if ($::macosx)
         {   my $indirect=&::static_label("$nmdecor$sym\$non_lazy_ptr");
-            &::mov($dst,&::DWP("$indirect-$reflabel",$base));
             $non_lazy_ptr{"$nmdecor$sym"}=$indirect;
         }
+    }
+}
+
+sub ::picsymbol
+{ my($dst,$sym,$base)=@_;
+
+    if (($::pic && ($::openbsd || $::elf || $::aout)) || $::macosx)
+    {
+        my $reflabel=&::label("PIC_setup");
+        if ($::macosx)
+        {   my $indirect=$non_lazy_ptr{"$nmdecor$sym"};
+            &::mov($dst,&::DWP("$indirect-$reflabel",$base));
+        }
         else
         {   &::lea($dst,&::DWP("_GLOBAL_OFFSET_TABLE_+[.-$reflabel]",
-                            $base));
+                $base));
             &::mov($dst,&::DWP("$sym\@GOT",$dst));
         }
     }
@@ -212,6 +230,30 @@ sub ::picmeup
     {   &::lea($dst,&::DWP($sym));      }
 }
 
+sub ::picadjust
+{ my($sym,$base)=@_;
+
+    if (($::pic && ($::openbsd || $::elf || $::aout)) || $::macosx)
+    {
+        my $reflabel=&::label("PIC_setup");
+        &::lea($sym,&::DWP("_GLOBAL_OFFSET_TABLE_+[.-$reflabel]",
+                $base,$sym));
+    }
+}
+
+sub ::code_sym
+{ my($sym)=@_;
+
+    if (($::pic && ($::openbsd || $::elf || $::aout)) || $::macosx)
+    {
+        $sym."\@GOTOFF";
+    }
+    else
+    {
+        $sym;
+    }
+}
+
 sub ::initseg
 { my $f=$nmdecor.shift;
 
@@ -264,4 +306,10 @@ ___
 sub ::dataseg
 {   push(@out,".data\n");   }
 
+sub ::rodataseg
+{   push(@out,".rodata\n");   }
+
+sub ::previous
+{   push(@out,".previous\n");   }
+
 1;