From 9cd7234d524cb8cde044d6924c18a7dd0e016d6fec1ad35696108ca534fca387 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 8 Jul 2016 11:34:00 +0000 Subject: [PATCH] Accepting request 407231 from home:pluskalm:branches:devel:tools:compiler - Update to version 2.12.02: OBS-URL: https://build.opensuse.org/request/show/407231 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=27 --- nasm-2.12.02.tar.xz | 3 +++ nasm-2.12.tar.xz | 3 --- nasm.changes | 28 +++++++++++++++++++++++++++ nasm.spec | 4 +--- nasm_change_unused.patch | 42 ---------------------------------------- 5 files changed, 32 insertions(+), 48 deletions(-) create mode 100644 nasm-2.12.02.tar.xz delete mode 100644 nasm-2.12.tar.xz delete mode 100644 nasm_change_unused.patch diff --git a/nasm-2.12.02.tar.xz b/nasm-2.12.02.tar.xz new file mode 100644 index 0000000..f841a0a --- /dev/null +++ b/nasm-2.12.02.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321 +size 782444 diff --git a/nasm-2.12.tar.xz b/nasm-2.12.tar.xz deleted file mode 100644 index e3e5e42..0000000 --- a/nasm-2.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f34cc1e984ed619b8f9e96cea632e3c6fdea5e039069dbcb63397b7bd004f5a8 -size 774808 diff --git a/nasm.changes b/nasm.changes index 88f5051..55ccbd5 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Jul 8 08:45:29 UTC 2016 - mpluskal@suse.com + +- Update to version 2.12.02: + * Fix preprocessor errors, especially %error and %warning, inside + if statements. + * Fix relative relocations in 32-bit Mach-O. + * More Codeview debug format fixes. + * If the MASM PTR keyword is encountered, issue a warning. This + is much more likely to indicate a MASM-ism encountered in NASM + than it is a valid label. + * This warning can be suppressed with -w-ptr, the [warning] + directive (see section 2.1.24) or by the macro definition + %idefine ptr %??. + * When an error or a warning comes from the expansion of a + multi-line macro, display the file and line numbers for the + expanded macros. + * Macros defined with .nolist do not get displayed. + * Add macros ilog2fw() and ilog2cw() to the ifunc macro package. + See section 5.4.1. +- Changes for version 2.12.01: + * Portability fixes for some platforms. + * Fix error when not specifying a list file. + * Correct the handling of macro-local labels in the Codeview + debugging format. + * Add CLZERO, MONITORX and MWAITX instructions. +- Drop no longer needed nasm_change_unused.patch + ------------------------------------------------------------------- Wed Mar 2 11:36:33 UTC 2016 - normand@linux.vnet.ibm.com diff --git a/nasm.spec b/nasm.spec index d533573..2f39429 100644 --- a/nasm.spec +++ b/nasm.spec @@ -17,14 +17,13 @@ Name: nasm -Version: 2.12 +Version: 2.12.02 Release: 0 Summary: Netwide Assembler (An x86 Assembler) License: BSD-2-Clause Group: Development/Languages/Other Url: http://www.nasm.us/ Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz -Patch1: nasm_change_unused.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: groff @@ -40,7 +39,6 @@ Read the licence agreement in %{_docdir}/nasm/Licence. %prep %setup -q -%patch1 -p1 %package doc Summary: Documentation for Nasm diff --git a/nasm_change_unused.patch b/nasm_change_unused.patch deleted file mode 100644 index cca65c2..0000000 --- a/nasm_change_unused.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Michel Normand -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 ---- - 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)