mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-03-25 18:10:23 +08:00
NASM 0.98.19
This commit is contained in:
parent
785ec1d973
commit
2654e0d8ea
2
nasm.h
2
nasm.h
@ -13,7 +13,7 @@
|
||||
|
||||
#define NASM_MAJOR_VER 0
|
||||
#define NASM_MINOR_VER 98
|
||||
#define NASM_VER "0.98.18"
|
||||
#define NASM_VER "0.98.19"
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
|
8
outelf.c
8
outelf.c
@ -554,7 +554,7 @@ static void elf_add_reloc (struct Section *sect, long segment,
|
||||
r->symbol = 0;
|
||||
for (i=0; i<nsects; i++)
|
||||
if (segment == sects[i]->index)
|
||||
r->symbol = i+2;
|
||||
r->symbol = i+3;
|
||||
if (!r->symbol)
|
||||
r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
|
||||
}
|
||||
@ -928,13 +928,13 @@ static struct SAA *elf_build_symtab (long *len, long *local)
|
||||
* Now some standard symbols defining the segments, for relocation
|
||||
* purposes.
|
||||
*/
|
||||
for (i = 1; i <= nsects; i++) {
|
||||
for (i = 1; i <= nsects+1; i++) {
|
||||
p = entry;
|
||||
WRITELONG (p, 0); /* no symbol name */
|
||||
WRITELONG (p, 0); /* offset zero */
|
||||
WRITELONG (p, 0); /* size zero */
|
||||
WRITESHORT (p, 3); /* local section-type thing */
|
||||
WRITESHORT (p, i); /* the section id */
|
||||
WRITESHORT (p, (i==1 ? SHN_ABS : i-1)); /* the section id */
|
||||
saa_wbytes (s, entry, 16L);
|
||||
*len += 16;
|
||||
(*local)++;
|
||||
@ -992,7 +992,7 @@ static struct SAA *elf_build_reltab (long *len, struct Reloc *r) {
|
||||
long sym = r->symbol;
|
||||
|
||||
if (sym >= GLOBAL_TEMP_BASE)
|
||||
sym += -GLOBAL_TEMP_BASE + (nsects+2) + nlocals;
|
||||
sym += -GLOBAL_TEMP_BASE + (nsects+3) + nlocals;
|
||||
|
||||
p = entry;
|
||||
WRITELONG (p, r->address);
|
||||
|
Loading…
x
Reference in New Issue
Block a user