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

subsections: don't lose the offset in the parent section

Browse Source 
We don't want to lose the offset into the parent section when we
create a subsection, at least not for the MachO backend which is
currently the only user of subsections. Allow ofmt->herelabel() to set
a flag to copy the section offset from the previous section.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel)
2018-06-27 20:20:21 -07:00
parent 12810fac92
commit d644119ded
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
output/outmacho.c
View File

@@ -1018,7 +1018,8 @@ static int32_t macho_section(char *name, int pass, int *bits)
}
static int32_t macho_herelabel(const char *name, enum label_type type,
int32_t section, int32_t *subsection)
int32_t section, int32_t *subsection,
bool *copyoffset)
{
struct section *s;
int32_t subsec;
@@ -1043,6 +1044,7 @@ static int32_t macho_herelabel(const char *name, enum label_type type,
}
s->subsection = subsec;
*copyoffset = true; /* Maintain previous offset */
return subsec;
}
@@ -1055,8 +1057,8 @@ static void macho_symdef(char *name, int32_t section, int64_t offset,
#if defined(DEBUG) && DEBUG>2
nasm_error(ERR_DEBUG,
" macho_symdef: %s, sec=%"PRIx32", off=%"PRIx64", is_global=%d, %s\n",
name, section, offset, is_global, special);
" macho_symdef: %s, pass0=%d, passn=%"PRId64", sec=%"PRIx32", off=%"PRIx64", is_global=%d, %s\n",
name, pass0, passn, section, offset, is_global, special);
#endif
if (is_global == 3) {