diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
| commit | e8d0e6fb18aae44474e864d8040d5ed44ff6acab (patch) | |
| tree | 547115848f342060950112d85b83706ef12fd800 /gpxe/src/arch/i386/scripts/i386.lds | |
| parent | 5396e250a679c368b3dd353c730358d6c54960c8 (diff) | |
| parent | 2dafb8402ed666b37f96f6e1579a99b8a8c85452 (diff) | |
| download | syslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.tar.gz | |
Merge branch 'fsc' into pathbased
Resolved Conflicts:
core/fs/ext2/ext2.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'gpxe/src/arch/i386/scripts/i386.lds')
| -rw-r--r-- | gpxe/src/arch/i386/scripts/i386.lds | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gpxe/src/arch/i386/scripts/i386.lds b/gpxe/src/arch/i386/scripts/i386.lds index 8a0c6733..33c75f90 100644 --- a/gpxe/src/arch/i386/scripts/i386.lds +++ b/gpxe/src/arch/i386/scripts/i386.lds @@ -152,6 +152,7 @@ SECTIONS { *(.eh_frame.*) *(.rel) *(.rel.*) + *(.discard) } /* @@ -193,17 +194,9 @@ SECTIONS { * Values calculated to save code from doing it * */ + _prefix_filesz_sect = ( ( _prefix_filesz + 511 ) / 512 ); _prefix_memsz_pgh = ( ( _prefix_memsz + 15 ) / 16 ); _prefix_memsz_sect = ( ( _prefix_memsz + 511 ) / 512 ); _text16_memsz_pgh = ( ( _text16_memsz + 15 ) / 16 ); _data16_memsz_pgh = ( ( _data16_memsz + 15 ) / 16 ); - - /* - * File size in paragraphs and sectors. Note that wherever the - * _filesz variables are used, there must be a corresponding - * .zinfo.fixup section. - * - */ - _filesz_pgh = ( ( _filesz + 15 ) / 16 ); - _filesz_sect = ( ( _filesz + 511 ) / 512 ); } |