nasm: upgrade 2.16.03 -> 3.01
PATCH v2 1/1 nasm: upgrade 2.16.03 -> 3.01
From: Ankur Tyagi <[email protected]>
License-Update: Copyright year updated to 2025 and upstream replaced verbose copyright headers with SPDX tags
Refreshed patches for the new version.
Release Note:
https://www.nasm.us/docs/3.01/nasmac.html
---
Changes in v2:
- updated license checksum
---
.../nasm/nasm/0001-stdlib-Add-strlcat.patch | 43 ++++---
.../0002-Add-debug-prefix-map-option.patch | 114 +++++++++---------
.../nasm/{nasm_2.16.03.bb => nasm_3.01.bb} | 4 +-
3 files changed, 81 insertions(+), 80 deletions(-)
rename meta/recipes-devtools/nasm/{nasm_2.16.03.bb => nasm_3.01.bb} (78%)meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch +21 -22
@@ -12,64 +12,64 @@ Signed-off-by: Joshua Watt <[email protected]> Makefile.in | 2 +- configure.ac | 2 ++ include/compiler.h | 4 ++++ - stdlib/strlcat.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 50 insertions(+), 1 deletion(-) + stdlib/strlcat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 stdlib/strlcat.c diff --git a/Makefile.in b/Makefile.in -index b85ebee..045fabe 100644 +index fcf33ab..d91f7ab 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -104,7 +104,7 @@ PROGOBJ = $(NASM) $(NDISASM) - PROGS = nasm$(X) ndisasm$(X) - - LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ +@@ -174,7 +174,7 @@ LIBOBJ_W = \ + # files to LIBOBJ_W, notably $(OUTPUTOBJ) + LIBOBJ_NW = \ + stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ - stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \ + stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) stdlib/strlcat.$(O) \ \ - nasmlib/ver.$(O) \ - nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \ + asm/directbl.$(O) \ + asm/pptok.$(O) \ diff --git a/configure.ac b/configure.ac -index 42cd198..e206338 100644 +index 448eeb2..f79c96c 100644 --- a/configure.ac +++ b/configure.ac -@@ -236,6 +236,7 @@ PA_FUNC_SNPRINTF +@@ -229,6 +229,7 @@ PA_FUNC_SNPRINTF PA_FUNC_VSNPRINTF AC_CHECK_FUNCS([strlcpy]) AC_CHECK_FUNCS([strrchrnul]) +AC_CHECK_FUNCS([strlcat]) dnl These types are POSIX-specific, and Windows does it differently... - AC_CHECK_TYPES([struct _stati64]) -@@ -255,6 +256,7 @@ AC_CHECK_DECLS(strsep) + AC_CHECK_TYPES([struct stat], [AC_CHECK_FUNCS([stat fstat])]) +@@ -246,6 +247,7 @@ AC_CHECK_DECLS(strsep) AC_CHECK_DECLS(strlcpy) AC_CHECK_DECLS(strnlen) AC_CHECK_DECLS(strrchrnul) +AC_CHECK_DECLS(strlcat) dnl Check for missing types - AC_TYPE_UINTPTR_T + AC_TYPE_UINTMAX_T diff --git a/include/compiler.h b/include/compiler.h -index 407c160..b64da6a 100644 +index 0ecd4e8..41c1cbf 100644 --- a/include/compiler.h +++ b/include/compiler.h -@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t); - char *strrchrnul(const char *, int); +@@ -181,6 +181,10 @@ size_t strlcpy(char *, const char *, size_t); + char * pure_func strrchrnul(const char *, int); #endif +#if !defined(HAVE_STRLCAT) || !HAVE_DECL_STRLCAT +size_t strlcat(char *, const char *, size_t); +#endif + - #ifndef __cplusplus /* C++ has false, true, bool as keywords */ + #if !defined(__cplusplus) || (__STDC_VERSION >= 202311L) + /* C++ and C23 have bool, false, and true as proper keywords */ # ifdef HAVE_STDBOOL_H - # include <stdbool.h> diff --git a/stdlib/strlcat.c b/stdlib/strlcat.c new file mode 100644 -index 0000000..7084d46 +index 0000000..c7cbd59 --- /dev/null +++ b/stdlib/strlcat.c -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +/* + * Copyright (c) 2019 Garmin Ltd. or its subsidiaries + *
@@ -112,4 +112,3 @@ index 0000000..7084d46 +} + +#endif -+
meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch +58 -56
261 lines not on this page · raw message
meta/recipes-devtools/nasm/nasm_3.01.bb renamed from meta/recipes-devtools/nasm/nasm_2.16.03.bb +2 -2
@@ -3,14 +3,14 @@ SECTION = "devel" HOMEPAGE = "http://www.nasm.us/" DESCRIPTION = "The Netwide Assembler (NASM) is an assembler and disassembler for the Intel x86 architecture." LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6178dc4f5355e40552448080e67a214b" SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ file://0001-stdlib-Add-strlcat.patch \ file://0002-Add-debug-prefix-map-option.patch \ " -SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" +SRC_URI[sha256sum] = "7a7b1ff3b0eef3247862f2fbe4ca605ccef770545d7af7979eba84a9d045c0b1" EXTRA_AUTORECONF:append = " -I autoconf/m4"
Quoted 11 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
License-Update: Copyright year updated to 2025 and upstream replaced verbose copyright headers with SPDX tags
Refreshed patches for the new version.
Release Note:
https://www.nasm.us/docs/3.01/nasmac.htmlSigned-off-by Ankur Tyagi <[email protected]>---
Hi Ankur,
Thanks for the v2.
Now it looks like this is breaking ovmf build:
ERROR: ovmf-edk2-stable202508-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/ovmf/edk2-stable202508/temp/run.do_compile.3506090' failed with exit code 1
...
| /srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/ovmf/edk2-stable202508/sources/ovmf-edk2-stable202508/Build/OvmfX64/RELEASE_GCC5/X64/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib/OUTPUT/X64/ExceptionHandlerAsm.iii:60: error: instruction not valid with 32-bit operand size
https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2810
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/2595
Can you have a look at the issue?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 20 lines · Mathieu Dubois-Briand
Quoted 11 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
License-Update: Copyright year updated to 2025 and upstream replaced verbose copyright headers with SPDX tags
Refreshed patches for the new version.
Release Note:
https://www.nasm.us/docs/3.01/nasmac.htmlSigned-off-by Ankur Tyagi <[email protected]>---
Hi Ankur,
Thanks for the v2.
Now it looks like this is breaking ovmf build:
Quoted 9 lines
ERROR: ovmf-edk2-stable202508-r0
do_compile: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/ovmf/edk2-stable202508/temp/run.do_compile.3506090' failed with exit code 1
...
|/srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/ovmf/edk2-stable202508/sources/ovmf-edk2-stable202508/Build/OvmfX64/RELEASE_GCC5/X64/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib/OUTPUT/X64/ExceptionHandlerAsm.iii:60: error: instruction not valid with 32-bit operand sizehttps://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2810
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/2595Can you have a look at the issue?
Hi Mathieu,
Sure, I will look into it but need few days as I am currently travelling.
Quoted 8 lines
Thanks,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com