Fix compilation of nasm-native with newer gcc versions 63/22363/2 guppy
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>
Mon, 9 Sep 2019 16:26:50 +0000 (18:26 +0200)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 10 Sep 2019 15:59:58 +0000 (15:59 +0000)
Backport of upstream change.
http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-devtools?id=e3c76fd3db928fc487e86325df299f3f02ef369c

This fixes a FTBS for nasm-native on guppy with gcc 8.2.x .

Bug-AGL: SPEC-2806

Change-Id: I44716098f015fb6c707ed4db62a23111fab79001
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
meta-agl-bsp/recipes-devtools/nasm/files/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch [new file with mode: 0644]
meta-agl-bsp/recipes-devtools/nasm/nasm_%.bbappend [new file with mode: 0644]

diff --git a/meta-agl-bsp/recipes-devtools/nasm/files/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch b/meta-agl-bsp/recipes-devtools/nasm/files/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch
new file mode 100644 (file)
index 0000000..12ae3a9
--- /dev/null
@@ -0,0 +1,27 @@
+From 77c3a77210d8ca8b94e999c711156e984a8dc737 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Mar 2018 11:05:33 -0700
+Subject: [PATCH] asmlib: Drop pure function attribute from seg_init
+
+seg_init returns void, so it is impure function
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ include/nasmlib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/nasmlib.h b/include/nasmlib.h
+index 79e866b..b80b7e2 100644
+--- a/include/nasmlib.h
++++ b/include/nasmlib.h
+@@ -191,7 +191,7 @@ int64_t readstrnum(char *str, int length, bool *warn);
+  * seg_init: Initialise the segment-number allocator.
+  * seg_alloc: allocate a hitherto unused segment number.
+  */
+-void pure_func seg_init(void);
++void seg_init(void);
+ int32_t pure_func seg_alloc(void);
+ /*
diff --git a/meta-agl-bsp/recipes-devtools/nasm/nasm_%.bbappend b/meta-agl-bsp/recipes-devtools/nasm/nasm_%.bbappend
new file mode 100644 (file)
index 0000000..3edf355
--- /dev/null
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_append = " file://0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch"
+