diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2010-04-20 15:05:02 +0400 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2010-04-21 01:06:44 +0400 |
| commit | d807d911feadad61c8afb09d74e4239859eba993 (patch) | |
| tree | 041240a9cc52f3e286553b3cb52a358345bec5b5 /output | |
| parent | 8d4d060104dc1ab4c7977a383a8f4af54e9302c9 (diff) | |
| download | nasm-d807d911feadad61c8afb09d74e4239859eba993.tar.gz | |
Elf: Rename SEG_ALIGN to SEC_FILEALIGN
It's Elf specifics. To not mess with segment alignment.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'output')
| -rw-r--r-- | output/outelf.h | 3 | ||||
| -rw-r--r-- | output/outelf32.c | 6 | ||||
| -rw-r--r-- | output/outelf64.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/output/outelf.h b/output/outelf.h index 252b3277..b47f3177 100644 --- a/output/outelf.h +++ b/output/outelf.h @@ -45,7 +45,8 @@ #define GLOBAL_TEMP_BASE 0x40000000 /* bigger than any sane symbol index */ -#define SEG_ALIGN 16 /* alignment of sections in file */ +/* alignment of sections in file */ +#define SEC_FILEALIGN 16 /* this stuff is needed for the stabs debugging format */ #define TY_STABSSYMLIN 0x40 /* ouch */ diff --git a/output/outelf32.c b/output/outelf32.c index bd175cea..f50fa1c7 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -975,7 +975,7 @@ static void elf_write(void) */ elf_foffs = 0x40 + 0x28 * nsections; - align = ALIGN(elf_foffs, SEG_ALIGN) - elf_foffs; + align = ALIGN(elf_foffs, SEC_FILEALIGN) - elf_foffs; elf_foffs += align; elf_nsect = 0; elf_sects = nasm_malloc(sizeof(*elf_sects) * nsections); @@ -1275,7 +1275,7 @@ static void elf_section_header(int name, int type, int flags, fwriteint32_t(type == 0 ? 0L : elf_foffs, ofile); fwriteint32_t(datalen, ofile); if (data) - elf_foffs += ALIGN(datalen, SEG_ALIGN); + elf_foffs += ALIGN(datalen, SEC_FILEALIGN); fwriteint32_t((int32_t)link, ofile); fwriteint32_t((int32_t)info, ofile); fwriteint32_t((int32_t)align, ofile); @@ -1288,7 +1288,7 @@ static void elf_write_sections(void) for (i = 0; i < elf_nsect; i++) if (elf_sects[i].data) { int32_t len = elf_sects[i].len; - int32_t reallen = ALIGN(len, SEG_ALIGN); + int32_t reallen = ALIGN(len, SEC_FILEALIGN); int32_t align = reallen - len; if (elf_sects[i].is_saa) saa_fpwrite(elf_sects[i].data, ofile); diff --git a/output/outelf64.c b/output/outelf64.c index 15785a38..47eba5b9 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -1074,7 +1074,7 @@ static void elf_write(void) */ elf_foffs = 0x40 + sizeof(Elf64_Shdr) * nsections; - align = ALIGN(elf_foffs, SEG_ALIGN) - elf_foffs; + align = ALIGN(elf_foffs, SEC_FILEALIGN) - elf_foffs; elf_foffs += align; elf_nsect = 0; elf_sects = nasm_malloc(sizeof(*elf_sects) * nsections); @@ -1371,7 +1371,7 @@ static void elf_section_header(int name, int type, uint64_t flags, fwriteint64_t(type == 0 ? 0L : elf_foffs, ofile); fwriteint64_t(datalen, ofile); if (data) - elf_foffs += ALIGN(datalen, SEG_ALIGN); + elf_foffs += ALIGN(datalen, SEC_FILEALIGN); fwriteint32_t((int32_t)link, ofile); fwriteint32_t((int32_t)info, ofile); fwriteint64_t((int64_t)align, ofile); @@ -1384,7 +1384,7 @@ static void elf_write_sections(void) for (i = 0; i < elf_nsect; i++) if (elf_sects[i].data) { int32_t len = elf_sects[i].len; - int32_t reallen = ALIGN(len, SEG_ALIGN); + int32_t reallen = ALIGN(len, SEC_FILEALIGN); int32_t align = reallen - len; if (elf_sects[i].is_saa) saa_fpwrite(elf_sects[i].data, ofile); |