43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From: Michel Normand <normand@linux.vnet.ibm.com>
|
||
|
|
Subject: nasm change unused
|
||
|
|
Date: Wed, 02 Mar 2016 12:38:37 +0100
|
||
|
|
|
||
|
|
nasm change _unused to xunused to avoid conflict
|
||
|
|
when building on PowerPC
|
||
|
|
|
||
|
|
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
|
||
|
|
---
|
||
|
|
compiler.h | 4 ++--
|
||
|
|
output/outmacho.c | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
Index: nasm-2.12/compiler.h
|
||
|
|
===================================================================
|
||
|
|
--- nasm-2.12.orig/compiler.h
|
||
|
|
+++ nasm-2.12/compiler.h
|
||
|
|
@@ -82,9 +82,9 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef __GNUC__
|
||
|
|
-# define _unused __attribute__((unused))
|
||
|
|
+# define xunused __attribute__((unused))
|
||
|
|
#else
|
||
|
|
-# define _unused
|
||
|
|
+# define xunused
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* Some versions of MSVC have these only with underscores in front */
|
||
|
|
Index: nasm-2.12/output/outmacho.c
|
||
|
|
===================================================================
|
||
|
|
--- nasm-2.12.orig/output/outmacho.c
|
||
|
|
+++ nasm-2.12/output/outmacho.c
|
||
|
|
@@ -301,7 +301,7 @@ static uint64_t rel_padcnt = 0;
|
||
|
|
ALIGN(x, fmt.ptrsize) /* align x to output format width */
|
||
|
|
|
||
|
|
static void debug_reloc (struct reloc *);
|
||
|
|
-static void debug_section_relocs (struct section *) _unused;
|
||
|
|
+static void debug_section_relocs (struct section *) xunused;
|
||
|
|
|
||
|
|
static struct section *get_section_by_name(const char *segname,
|
||
|
|
const char *sectname)
|