diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 17:14:36 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 17:14:36 -0700 |
| commit | a3db726f02be8ac285f51106070a04aca7ab0142 (patch) | |
| tree | be35b568bba4a7b41008e391e6ab13bc3bd3ecf5 /nasmlib | |
| parent | 367350319b8c5d2a79f400915d7a51be9cb98209 (diff) | |
| parent | 8877a3ddb08e5cb7cd60704380ccccb5bb5c36b2 (diff) | |
| download | nasm-a3db726f02be8ac285f51106070a04aca7ab0142.tar.gz | |
Merge remote-tracking branch 'github/nasm-2.15.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'nasmlib')
| -rwxr-xr-x | nasmlib/perfhash.pl | 6 | ||||
| -rw-r--r-- | nasmlib/strlist.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nasmlib/perfhash.pl b/nasmlib/perfhash.pl index 8df21f69..9236bfec 100755 --- a/nasmlib/perfhash.pl +++ b/nasmlib/perfhash.pl @@ -334,18 +334,18 @@ if ($output eq 'h') { } print F "\n};\n\n"; - print F "#define UNUSED (65536/3)\n\n"; + print F "#define UNUSED_HASH_ENTRY (65536/3)\n\n"; printf F "static const int16_t %s_hashvals[%d] = ", $name, $n*2; $c = '{'; for (my $i = 0; $i < $n; $i++) { my $h = ${$g}[$i*2+0]; - print F "$c\n ", defined($h) ? $h : 'UNUSED'; + print F "$c\n ", defined($h) ? $h : 'UNUSED_HASH_ENTRY'; $c = ','; } for (my $i = 0; $i < $n; $i++) { my $h = ${$g}[$i*2+1]; - print F "$c\n ", defined($h) ? $h : 'UNUSED'; + print F "$c\n ", defined($h) ? $h : 'UNUSED_HASH_ENTRY'; $c = ','; } print F "\n};\n\n"; diff --git a/nasmlib/strlist.c b/nasmlib/strlist.c index db5a09ab..449304b7 100644 --- a/nasmlib/strlist.c +++ b/nasmlib/strlist.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 1996-2018 The NASM Authors - All Rights Reserved + * Copyright 1996-2020 The NASM Authors - All Rights Reserved * See the file AUTHORS included with the NASM distribution for * the specific copyright holders. * @@ -102,7 +102,8 @@ strlist_add(struct strlist *list, const char *str) const struct strlist_entry * strlist_vprintf(struct strlist *list, const char *fmt, va_list ap) { - struct strlist_entry *e; + /* clang miscompiles offsetin() unless e is initialized here */ + struct strlist_entry *e = NULL; struct hash_insert hi; if (!list) |