From cc93556725eb1a68fc088ddeef8e18bb6ec805bf Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 17 Nov 2008 19:58:02 -0800
Subject: [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.
---
 src/arch/i386/scripts/i386.lds | 12 ++++++------
 1 file 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		= .;
 
     /*
-- 
cgit v1.2.3-55-g7522