From 136c4bc73b554e2dbb6d24caf1dc412ff76a760b Mon Sep 17 00:00:00 2001 From: "Knut St. Osmundsen" Date: Wed, 24 Feb 2016 14:14:22 +0100 Subject: [PATCH 1/3] doc: Remove --allow-64-bit leftover from help text. Removes help text left behind when --allow-64-bit was turned into default behavior + warning. Signed-off-by: Knut St. Osmundsen Signed-off-by: H. Peter Anvin --- nasm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/nasm.c b/nasm.c index a176f251..469cd518 100644 --- a/nasm.c +++ b/nasm.c @@ -805,9 +805,6 @@ static bool process_arg(char *p, char *q) "--prefix,--postfix\n" " this options prepend or append the given argument to all\n" " extern and global variables\n" - "--allow-64-bit\n" - " do not restrict 64-bit code to 64-bit capable output\n" - " formats (use with care, no complaining)\n\n" "Warnings:\n"); for (i = 0; i <= ERR_WARN_MAX; i++) printf(" %-23s %s (default %s)\n", From 52ae33a2cbcdd946c6787ebeaa066e149085a8e8 Mon Sep 17 00:00:00 2001 From: "Knut St. Osmundsen" Date: Wed, 24 Feb 2016 14:08:22 +0100 Subject: [PATCH 2/3] Remove unnecessary C99 features which break Visual C++ 2010 Fixes Visual C++ 2010 breakage in recently added Codeview 8 code; these are C99 features which were not necessary to introduce. Signed-off-by: Knut St. Osmundsen Signed-off-by: H. Peter Anvin --- md5.h | 2 +- output/codeview.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/md5.h b/md5.h index 147d3dd9..ea34cda1 100644 --- a/md5.h +++ b/md5.h @@ -1,7 +1,7 @@ #ifndef _MD5_H_ #define _MD5_H_ -#include +#include #define MD5_HASHBYTES 16 diff --git a/output/codeview.c b/output/codeview.c index 2f5bb690..975eef92 100644 --- a/output/codeview.c +++ b/output/codeview.c @@ -59,15 +59,15 @@ static void cv8_output(int type, void *param); static void cv8_cleanup(void); struct dfmt df_cv8 = { - .fullname = "Codeview 8", - .shortname = "cv8", - .init = cv8_init, - .linenum = cv8_linenum, - .debug_deflabel = cv8_deflabel, - .debug_directive = null_debug_directive, - .debug_typevalue = cv8_typevalue, - .debug_output = cv8_output, - .cleanup = cv8_cleanup, + "Codeview 8", /* .fullname */ + "cv8", /* .shortname */ + cv8_init, /* .init */ + cv8_linenum, /* .linenum */ + cv8_deflabel, /* .debug_deflabel */ + null_debug_directive, /* .debug_directive */ + cv8_typevalue, /* .debug_typevalue */ + cv8_output, /* .debug_output */ + cv8_cleanup, /* .cleanup */ }; /******************************************************************************* From 8d9f591005be5d9e973687af2472a8f9f6c525ae Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 27 Feb 2016 00:15:13 -0800 Subject: [PATCH 3/3] configure.in: add -fwrapv to gcc and compatible compilers Add the -fwrapv to gcc and compatible C compilers, to enforce deterministic 2's-complement behavior with regards to signed and unsigned integer types. Signed-off-by: H. Peter Anvin --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index 63192065..01c0f07e 100644 --- a/configure.in +++ b/configure.in @@ -79,6 +79,7 @@ dnl If we have gcc, add appropriate options PA_ADD_CFLAGS([-W]) PA_ADD_CFLAGS([-Wall]) PA_ADD_CFLAGS([-std=c99]) +PA_ADD_CFLAGS([-fwrapv]) dnl Look for programs... AC_CHECK_PROGS(NROFF, nroff, false)