Browse Source

[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.
tags/v0.9.6
Michael Brown 15 years ago
parent
commit
cc93556725
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      src/arch/i386/scripts/i386.lds

+ 6
- 6
src/arch/i386/scripts/i386.lds View File

@@ -163,30 +163,30 @@ SECTIONS {
163 163
     PROVIDE ( _max_align = 16 );
164 164
     .			= 0;
165 165
 
166
+    .			= ALIGN ( _max_align );
166 167
     _prefix_lma		= .;
167 168
     .			+= _prefix_filesz;
168
-    .			= ALIGN ( _max_align );
169 169
 
170
+    .			= ALIGN ( _max_align );
170 171
     _payload_lma	= .;
171
-
172 172
     _text16_lma		= .;
173 173
     .			+= _text16_filesz;
174
-    .			= ALIGN ( _max_align );
175 174
 
175
+    .			= ALIGN ( _max_align );
176 176
     _data16_lma		= .;
177 177
     .			+= _data16_filesz;
178
-    .			= ALIGN ( _max_align );
179 178
 
179
+    .			= ALIGN ( _max_align );
180 180
     _textdata_lma	= .;
181 181
     .			+= _textdata_filesz;
182
-    .			= ALIGN ( _max_align );
183 182
 
184 183
     _filesz		= .; /* Do not include zinfo block in file size */
185 184
 
185
+    .			= ALIGN ( _max_align );
186 186
     _zinfo_lma		= .;
187 187
     .			+= _zinfo_filesz;
188
-    .			= ALIGN ( _max_align );
189 188
 
189
+    .			= ALIGN ( _max_align );
190 190
     _end_lma		= .;
191 191
 
192 192
     /*

Loading…
Cancel
Save