Bug 1712832 - Upgrade to nasm 2.15.05. r=firefox-build-system-reviewers,nalexander

Differential Revision: https://phabricator.services.mozilla.com/D116176

taskcluster/ci/fetch/toolchains.yml

@@ -215,13 +215,13 @@ nasm-2.14.02:
         sha256: e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5
         size: 827620
 
-nasm-2.13.02:
-    description: nasm 2.13.02 source code
+nasm-2.15.05:
+    description: nasm 2.15.05 source code
     fetch:
         type: static-url
-        url: https://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.xz
-        sha256: 8ac3235f49a6838ff7a8d7ef7c19a4430d0deecc0c2d3e3e237b5e9f53291757
-        size: 805744
+        url: https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz
+        sha256: 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f
+        size: 995732
 
 wix-3.14.0:
     description: wix 3.14.0.2812 binary release

taskcluster/ci/toolchain/nasm.yml

@@ -23,7 +23,7 @@ win64-nasm:
         arguments: ['win64']
     fetches:
         fetch:
-            - nasm-2.14.02
+            - nasm-2.15.05
         toolchain:
             - linux64-clang-mingw-x64
 
@@ -38,7 +38,7 @@ macosx64-nasm:
         arguments: ['macosx64']
     fetches:
         fetch:
-            - nasm-2.14.02
+            - nasm-2.15.05
         toolchain:
             - linux64-cctools-port-clang-11
             - linux64-clang-11-macosx-cross
@@ -72,7 +72,7 @@ linux64-nasm:
         arguments: ['linux64']
     fetches:
         fetch:
-            - nasm-2.14.02
+            - nasm-2.15.05
         toolchain:
             - linux64-clang-11
             - linux64-sysroot

taskcluster/scripts/misc/build-nasm.sh

@@ -8,6 +8,29 @@ if [ -n "$TOOLTOOL_MANIFEST" ]; then
 fi
 
 cd $MOZ_FETCHES_DIR/nasm-*
+
+case $(cat version) in
+2.14.02)
+        # Fix for .debug_loc section containing garbage on elf32
+        # https://bugzilla.nasm.us/show_bug.cgi?id=3392631
+        patch -p1 <<'EOF'
+diff --git a/output/outelf.c b/output/outelf.c
+index de99d076..47031e12 100644
+--- a/output/outelf.c
++++ b/output/outelf.c
+@@ -3275,7 +3275,7 @@ static void dwarf_generate(void)
+     WRITELONG(pbuf,framelen-4); /* initial length */
+ 
+     /* build loc section */
+-    loclen = 16;
++    loclen = is_elf64() ? 16 : 8;
+     locbuf = pbuf = nasm_malloc(loclen);
+     if (is_elf32()) {
+         WRITELONG(pbuf,0);  /* null  beginning offset */
+EOF
+	;;
+esac
+
 case "$1" in
     win64)
         export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH"
@@ -27,23 +50,6 @@ case "$1" in
         EXE=
 	;;
     *)
-        # Fix for .debug_loc section containing garbage on elf32
-        # https://bugzilla.nasm.us/show_bug.cgi?id=3392631
-        patch -p1 <<'EOF'
-diff --git a/output/outelf.c b/output/outelf.c
-index de99d076..47031e12 100644
---- a/output/outelf.c
-+++ b/output/outelf.c
-@@ -3275,7 +3275,7 @@ static void dwarf_generate(void)
-     WRITELONG(pbuf,framelen-4); /* initial length */
- 
-     /* build loc section */
--    loclen = 16;
-+    loclen = is_elf64() ? 16 : 8;
-     locbuf = pbuf = nasm_malloc(loclen);
-     if (is_elf32()) {
-         WRITELONG(pbuf,0);  /* null  beginning offset */
-EOF
         ./configure CC="$MOZ_FETCHES_DIR/clang/bin/clang --sysroot=$MOZ_FETCHES_DIR/sysroot"
         EXE=
         ;;