diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-06-27 20:20:21 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-06-27 20:20:21 -0700 |
| commit | d644119ded5aa963e334ec035f782c0b244d855c (patch) | |
| tree | bbcc106c989f81ce40ff8ddb75d4ab83ce966ef6 /output/outmacho.c | |
| parent | 12810fac9294cd205f3d7a4a1ce9fab480e42f89 (diff) | |
| download | nasm-d644119ded5aa963e334ec035f782c0b244d855c.tar.gz | |
subsections: don't lose the offset in the parent section
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>
Diffstat (limited to 'output/outmacho.c')
| -rw-r--r-- | output/outmacho.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/output/outmacho.c b/output/outmacho.c index 75650b47..93b4768e 100644 --- a/output/outmacho.c +++ b/output/outmacho.c @@ -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) { |