Accepting request 408686 from devel:tools:compiler

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/408686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nasm?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2016-07-16 20:10:51 +00:00 committed by Git OBS Bridge
commit 05091e2254
5 changed files with 32 additions and 48 deletions

3
nasm-2.12.02.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321
size 782444

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f34cc1e984ed619b8f9e96cea632e3c6fdea5e039069dbcb63397b7bd004f5a8
size 774808

View File

@ -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 Wed Mar 2 11:36:33 UTC 2016 - normand@linux.vnet.ibm.com

View File

@ -17,14 +17,13 @@
Name: nasm Name: nasm
Version: 2.12 Version: 2.12.02
Release: 0 Release: 0
Summary: Netwide Assembler (An x86 Assembler) Summary: Netwide Assembler (An x86 Assembler)
License: BSD-2-Clause License: BSD-2-Clause
Group: Development/Languages/Other Group: Development/Languages/Other
Url: http://www.nasm.us/ Url: http://www.nasm.us/
Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz
Patch1: nasm_change_unused.patch
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: groff BuildRequires: groff
@ -40,7 +39,6 @@ Read the licence agreement in %{_docdir}/nasm/Licence.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%package doc %package doc
Summary: Documentation for Nasm Summary: Documentation for Nasm

View File

@ -1,42 +0,0 @@
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)