Merge branch 'master' of git+ssh://repo.or.cz/srv/git/nasm

This commit is contained in:
H. Peter Anvin 2009-01-18 22:55:33 -08:00
commit c8c62fe4d3
2 changed files with 4 additions and 2 deletions

View File

@ -484,7 +484,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
type = SHT_PROGBITS;
} else if (!nasm_stricmp(q, "nobits")) {
type = SHT_NOBITS;
}
} else if (pass == 1) error(ERR_WARNING, "Unknown section attribute '%s' ignored on"
" declaration of section `%s'", q, name);
}
if (!strcmp(name, ".comment") ||

View File

@ -520,7 +520,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
type = SHT_PROGBITS;
} else if (!nasm_stricmp(q, "nobits")) {
type = SHT_NOBITS;
}
} else if (pass == 1) error(ERR_WARNING, "Unknown section attribute '%s' ignored on"
" declaration of section `%s'", q, name);
}
if (!strcmp(name, ".comment") ||