diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-07-02 13:12:49 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-07-03 19:01:20 +0200 |
| commit | b068a9b914887af5cc99895754412582fbb0e10b (patch) | |
| tree | 4321800c8cd4f646ad24ceeefaf9f1e92990ce30 /crypto/perlasm | |
| parent | 4cb004573a28fe5f8f8d95dc9407e0fe9df6f14c (diff) | |
perlasm/x86_64-xlate.pl: refine symbol recognition in .xdata.
Hexadecimals were erroneously recognized as symbols in .xdata.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6626)
Diffstat (limited to 'crypto/perlasm')
| -rwxr-xr-x | crypto/perlasm/x86_64-xlate.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index eac21c1c69..0bde5ee77c 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -877,7 +877,7 @@ my %globals; $var=~s/^(0b[0-1]+)/oct($1)/eig; $var=~s/^0x([0-9a-f]+)/0$1h/ig if ($masm); if ($sz eq "D" && ($current_segment=~/.[px]data/ || $dir eq ".rva")) - { $var=~s/([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; } + { $var=~s/^([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; } $var; }; |