summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2008-11-18 04:58:02 +0100
committerMichael Brown2008-11-18 04:58:02 +0100
commitcc93556725eb1a68fc088ddeef8e18bb6ec805bf (patch)
treedd9238ae1515fb61d10eecc7a6d582bf2977884f
parent[build] Discard junk sections created by newer gcc versions (diff)
downloadipxe-cc93556725eb1a68fc088ddeef8e18bb6ec805bf.tar.gz
ipxe-cc93556725eb1a68fc088ddeef8e18bb6ec805bf.tar.xz
ipxe-cc93556725eb1a68fc088ddeef8e18bb6ec805bf.zip
[build] Fix calculation of _filesz
_filesz was incorrectly forced to be aligned up to MAX_ALIGN. In a non-compressed build, this would cause a build failure unless _filesz happened to already be aligned to MAX_ALIGN.
-rw-r--r--src/arch/i386/scripts/i386.lds12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds
index 355fb184..8a0c6733 100644
--- a/src/arch/i386/scripts/i386.lds
+++ b/src/arch/i386/scripts/i386.lds
@@ -163,30 +163,30 @@ SECTIONS {
PROVIDE ( _max_align = 16 );
. = 0;
+ . = ALIGN ( _max_align );
_prefix_lma = .;
. += _prefix_filesz;
- . = ALIGN ( _max_align );
+ . = ALIGN ( _max_align );
_payload_lma = .;
-
_text16_lma = .;
. += _text16_filesz;
- . = ALIGN ( _max_align );
+ . = ALIGN ( _max_align );
_data16_lma = .;
. += _data16_filesz;
- . = ALIGN ( _max_align );
+ . = ALIGN ( _max_align );
_textdata_lma = .;
. += _textdata_filesz;
- . = ALIGN ( _max_align );
_filesz = .; /* Do not include zinfo block in file size */
+ . = ALIGN ( _max_align );
_zinfo_lma = .;
. += _zinfo_filesz;
- . = ALIGN ( _max_align );
+ . = ALIGN ( _max_align );
_end_lma = .;
/*