aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-10-10 00:25:06 -04:00
Code Activity

Merge branch 'nasm-2.12.xx'

Browse Source 
Resolved Conflicts:
	configure.in
	output/codeview.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2016-03-01 21:51:40 -08:00
parent 8aba13b51f 8d9f591005
commit b9c1ca7e8d
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.in
View File

@@ -75,6 +75,10 @@ AH_TEMPLATE(WORDS_LITTLEENDIAN,
[Define to 1 if your processor stores words with the least significant [Define to 1 if your processor stores words with the least significant
byte first (like Intel and VAX, unlike Motorola and SPARC).]) byte first (like Intel and VAX, unlike Motorola and SPARC).])
dnl Force gcc and gcc-compatible compilers treat signed integers
dnl as 2's complement
PA_ADD_CFLAGS([-fwrapv])
dnl Look for programs... dnl Look for programs...
AC_CHECK_PROGS(NROFF, nroff, false) AC_CHECK_PROGS(NROFF, nroff, false)
AC_CHECK_PROGS(ASCIIDOC, asciidoc, false) AC_CHECK_PROGS(ASCIIDOC, asciidoc, false)
@@ -180,9 +184,10 @@ AC_ARG_ENABLE([ccache],
[CC="ccache $CC"], [CC="ccache $CC"],
[]) [])
dnl If we have gcc, add appropriate options dnl If we have gcc, add appropriate code cleanliness options
PA_ADD_CFLAGS([-W]) PA_ADD_CFLAGS([-W])
PA_ADD_CFLAGS([-Wall]) PA_ADD_CFLAGS([-Wall])
PA_ADD_CFLAGS([-std=c99])
PA_ADD_CFLAGS([-pedantic]) PA_ADD_CFLAGS([-pedantic])
AC_ARG_ENABLE([werror], AC_ARG_ENABLE([werror],
[AC_HELP_STRING([--enable-werror], [AC_HELP_STRING([--enable-werror],

2
md5.h
View File

@@ -1,7 +1,7 @@
#ifndef _MD5_H_ #ifndef _MD5_H_
#define _MD5_H_ #define _MD5_H_
#include <stdint.h> #include <inttypes.h>
#define MD5_HASHBYTES 16 #define MD5_HASHBYTES 16

3
nasm.c
View File

@@ -807,9 +807,6 @@ static bool process_arg(char *p, char *q)
"--prefix,--postfix\n" "--prefix,--postfix\n"
" this options prepend or append the given argument to all\n" " this options prepend or append the given argument to all\n"
" extern and global variables\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"); "Warnings:\n");
for (i = 0; i <= ERR_WARN_MAX; i++) for (i = 0; i <= ERR_WARN_MAX; i++)
printf(" %-23s %s (default %s)\n", printf(" %-23s %s (default %s)\n",

18
output/codeview.c
View File

@@ -59,15 +59,15 @@ static void cv8_output(int type, void *param);
static void cv8_cleanup(void); static void cv8_cleanup(void);
const struct dfmt df_cv8 = { const struct dfmt df_cv8 = {
.fullname = "Codeview 8", "Codeview 8", /* .fullname */
.shortname = "cv8", "cv8", /* .shortname */
.init = cv8_init, cv8_init, /* .init */
.linenum = cv8_linenum, cv8_linenum, /* .linenum */
.debug_deflabel = cv8_deflabel, cv8_deflabel, /* .debug_deflabel */
.debug_directive = null_debug_directive, null_debug_directive, /* .debug_directive */
.debug_typevalue = cv8_typevalue, cv8_typevalue, /* .debug_typevalue */
.debug_output = cv8_output, cv8_output, /* .debug_output */
.cleanup = cv8_cleanup, cv8_cleanup, /* .cleanup */
}; };
/******************************************************************************* /*******************************************************************************