浏览代码

[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 16 年前
父节点
当前提交
cc93556725
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6
    6
      src/arch/i386/scripts/i386.lds

+ 6
- 6
src/arch/i386/scripts/i386.lds 查看文件

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

正在加载...
取消
保存