mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-21 03:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nasm-2.14.xx'

Browse Source 
Fixes for various build problems.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2018-06-15 17:44:30 -07:00
commit cd133a6f2d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -74,13 +74,13 @@ endif
.PHONY: manpages nsis
.c.$(O):
$(CC) -c $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $<
$(CC) -c $(ALL_CFLAGS) -o $@ $<
.c.s:
$(CC) -S $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $<
$(CC) -S $(ALL_CFLAGS) -o $@ $<
.c.i:
$(CC) -E $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $<
$(CC) -E $(ALL_CFLAGS) -o $@ $<
.txt.xml:
$(ASCIIDOC) -b docbook -d manpage -o $@ $<

2
asm/listing.c
View File

@ -199,7 +199,7 @@ static void list_address(int64_t offset, const char *brackets,
static void list_output(const struct out_data *data)
{
char q[20];
char q[24];
uint64_t size = data->size;
uint64_t offset = data->offset;
const uint8_t *p = data->data;

3
asm/parser.c
View File

@ -436,6 +436,8 @@ insn *parse_line(int pass, char *buffer, insn *result)
bool recover;
int i;
nasm_static_assert(P_none == 0);
restart_parse:
first = true;
result->forw_ref = false;
@ -444,7 +446,6 @@ restart_parse:
stdscan_set(buffer);
i = stdscan(NULL, &tokval);
nasm_static_assert(P_none == 0);
memset(result->prefixes, P_none, sizeof(result->prefixes));
result->times = 1; /* No TIMES either yet */
result->label = NULL; /* Assume no label */

3
configure.ac
View File

@ -277,6 +277,9 @@ dnl Suppress format warning on Windows targets due to their <inttypes.h>
PA_ADD_CFLAGS([-Wpedantic-ms-format],[-Wno-pedantic-ms-format])
PA_ADD_CFLAGS([-Wc90-c99-compat])
PA_ADD_CFLAGS([-Wlong-long],[-Wno-long-long])
dnl This is needed because we intentionally expect strncpy() to fill
dnl in a zero-padded (not zero-terminated) buffer in several backends
PA_ADD_CFLAGS([-Wstringop-truncation],[-Wno-stringop-truncation])
dnl PA_ADD_CFLAGS([-Wwrite-strings])
PA_ARG_ENABLED([werror],
[compile with -Werror to error out on any warning],