yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take BoringSSL e157dc9: Make symbol-prefixing work on 32-bit x86.

Browse Source
This commit is contained in:
Brian Smith 2019-01-03 17:43:11 -10:00
commit 6782cc5a61
2 changed files with 16 additions and 3 deletions
crypto/perlasm
x86asm.pl
util
read_symbols.go

17
crypto/perlasm/x86asm.pl

@ -262,7 +262,20 @@ $comment This file is generated from a similarly-named Perl script in the Boring
$comment source tree. Do not edit by hand.
___
print "#if defined(__i386__)\n" unless ($win32 || $netware);
if ($win32 || $netware) {
print <<___ unless $masm;
%ifdef BORINGSSL_PREFIX
%include "boringssl_prefix_symbols_nasm.inc"
%endif
___
} else {
print <<___;
#if defined(__i386__)
#if defined(BORINGSSL_PREFIX)
#include <boringssl_prefix_symbols_asm.h>
#endif
___
}
print @out;
print "#endif\n" unless ($win32 || $netware);
}
@ -288,7 +301,7 @@ sub ::asm_init
#elsif (($type eq "nw-mwasm"))
#{ $netware=1; $mwerks=1; require "x86nasm.pl"; }
elsif (($type eq "win32"))
{ $win32=1; require "x86masm.pl"; }
{ $win32=1; $masm=1; require "x86masm.pl"; }
elsif (($type eq "macosx"))
{ $aout=1; $macosx=1; require "x86gas.pl"; }
elsif (($type eq "android"))

2
util/read_symbols.go

@ -140,7 +140,7 @@ func main() {
break
}
}
if skip || isCXXSymbol(s) || strings.HasPrefix(s, "__real@") {
if skip || isCXXSymbol(s) || strings.HasPrefix(s, "__real@") || strings.HasPrefix(s, "__x86.get_pc_thunk.") {
continue
}
if _, err := fmt.Fprintln(out, s); err != nil {