Take BoringSSL 'a43c76d': Work around nasm bug with empty assembly files

briansmith · Sep 28, 2023 · 78b0af8 · 78b0af8
2 parents 6452e74 + a43c76d
commit 78b0af8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
@@ -1605,7 +1605,12 @@ sub process_line {
 #endif
 ___
 } elsif ($nasm) {
-    print "\%endif\n";
+    print <<___;
+\%else
+; Work around https://bugzilla.nasm.us/show_bug.cgi?id=3392738
+ret
+\%endif
+___
 } else {
     die "unknown assembler";
 }

diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
@@ -288,7 +288,12 @@ sub ::asm_finish
 \%ifidn __OUTPUT_FORMAT__, win32
 ___
         print @out;
-        print "\%endif\n";
+        print <<___ unless $masm;
+\%else
+; Work around https://bugzilla.nasm.us/show_bug.cgi?id=3392738
+ret
+\%endif
+___
     } else {
         my $target;
         if ($elf) {