svn commit: r233211 - stable/8/sys/conf

[Ken Smith]

Author: kensmith
Date: Mon Mar 19 22:20:47 2012
New Revision: 233211
URL: http://svn.freebsd.org/changeset/base/233211

Log:
  We seem to be having issues with a bug in the loader that causes it to
  estimate the program header size for the kernel wrong.  It can result
  in the kernel build failing with the message:
  
  ld: kernel.debug: Not enough room for program headers (allocated 5, need 6)
  ld: final link failed: Bad value
  
  Tinderbox builds were failing with this message a short time ago, and
  I encountered it while preparing the i386 build machine for the 8.3-RC2
  builds.
  
  Konstantin has looked at it and believes the issue was fixed in recent
  versions of binutils.  It is a bit too late in the release process to
  be messing around with the loader and/or binutils.  This workaround
  seems to take care of the problem for now.
  
  Reviewed by:	kib

Modified:
  stable/8/sys/conf/ldscript.i386

Modified: stable/8/sys/conf/ldscript.i386
==============================================================================
--- stable/8/sys/conf/ldscript.i386	Mon Mar 19 22:08:13 2012	(r233210)
+++ stable/8/sys/conf/ldscript.i386	Mon Mar 19 22:20:47 2012	(r233211)
@@ -6,7 +6,7 @@ SEARCH_DIR(/usr/lib);
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = kernbase + kernload + SIZEOF_HEADERS;
+  . = kernbase + kernload + 256;
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}