X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fperlasm%2Fx86unix.pl;h=72bde061c563d0ab816df1be6c6f0c3d476ade4a;hb=4f17dfcd752221fc7515d55642cacd9aa6d1d0af;hp=b1c87037dde6b740665957c48d9bfcbe5f652840;hpb=3cc9a89dda7165f9363f06db3559c5dea043bb73;p=openssl.git

diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index b1c87037dd..72bde061c5 100644
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -345,15 +345,15 @@ sub main'function_end
 	popl	%ebx
 	popl	%ebp
 	ret
-.${func}_end:
+.L_${func}_end:
 EOF
 	push(@out,$tmp);
 
 	if ($main'cpp)
-		{ push(@out,"\tSIZE($func,.${func}_end-$func)\n"); }
+		{ push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); }
 	elsif ($main'gaswin)
                 { $tmp=push(@out,"\t.align 4\n"); }
-	else	{ push(@out,"\t.size\t$func,.${func}_end-$func\n"); }
+	else	{ push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); }
 	push(@out,".ident	\"$func\"\n");
 	$stack=0;
 	%label=();
@@ -566,19 +566,19 @@ sub main'picmeup
 ___
 		push(@out,$tmp);
 		}
-	elsif ($main'pic && $main'elf)
+	elsif ($main'pic && ($main'elf || $main'aout))
 		{
 		push(@out,"\t.align\t8\n");
 		&main'call(&main'label("PIC_me_up"));
 		&main'set_label("PIC_me_up");
 		&main'blindpop($dst);
-		&main'add($dst,"\$_GLOBAL_OFFSET_TABLE_+[.-" .
+		&main'add($dst,"\$$under"."_GLOBAL_OFFSET_TABLE_+[.-".
 				&main'label("PIC_me_up") . "]");
-		&main'mov($dst,&main'DWP("$under$sym\@GOT",$dst));
+		&main'mov($dst,&main'DWP($sym."\@GOT",$dst));
 		}
 	else
 		{
-		&main'lea($dst,&main'DWP("$under$sym"));
+		&main'lea($dst,&main'DWP($sym));
 		}
 	}