04a9801510
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
36 lines
1.3 KiB
Groff
36 lines
1.3 KiB
Groff
diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl
|
|
index 1741342..917d0f8 100644
|
|
--- a/crypto/perlasm/x86masm.pl
|
|
+++ b/crypto/perlasm/x86masm.pl
|
|
@@ -18,10 +18,10 @@ sub ::generic
|
|
|
|
if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no []
|
|
{ $opcode="mov"; }
|
|
- elsif ($opcode !~ /movq/)
|
|
+ elsif ($opcode !~ /mov[dq]$/)
|
|
{ # fix xmm references
|
|
- $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
|
|
- $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
|
|
+ $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i);
|
|
+ $arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
|
|
}
|
|
|
|
&::emit($opcode,@arg);
|
|
@@ -160,13 +160,13 @@ sub ::public_label
|
|
{ push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); }
|
|
|
|
sub ::data_byte
|
|
-{ push(@out,("DB\t").join(',',@_)."\n"); }
|
|
+{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); }
|
|
|
|
sub ::data_short
|
|
-{ push(@out,("DW\t").join(',',@_)."\n"); }
|
|
+{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); }
|
|
|
|
sub ::data_word
|
|
-{ push(@out,("DD\t").join(',',@_)."\n"); }
|
|
+{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); }
|
|
|
|
sub ::align
|
|
{ push(@out,"ALIGN\t$_[0]\n"); }
|