[Glibc-bsd-commits] r2061 - in trunk: kfreebsd-6/debian kfreebsd-6/debian/patches kfreebsd-7/debian kfreebsd-7/debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-12-07 12:18:57 +0000 (Fri, 07 Dec 2007)
New Revision: 2061

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/patches/912_binutils.diff
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/912_binutils.diff
Log:
* extend 912_binutils.diff to be (hopefully) correctly buildable 
  with current binutils also on kfreebsd-amd64



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2007-12-04 17:19:54 UTC (rev 2060)
+++ trunk/kfreebsd-6/debian/changelog	2007-12-07 12:18:57 UTC (rev 2061)
@@ -9,6 +9,7 @@
   * Backport packaging changes from kfreebsd-7
   * Changed building rules to be correctly buildable with current binutils
     - add 020_linker.diff and gen-ld-u-options
+    - extend 912_binutils.diff
 
   [ Aurelien Jarno ]
   * arch/i386/586.config and arch/i386/586-smp.config: also support i686 CPU. 

Modified: trunk/kfreebsd-6/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/912_binutils.diff	2007-12-04 17:19:54 UTC (rev 2060)
+++ trunk/kfreebsd-6/debian/patches/912_binutils.diff	2007-12-07 12:18:57 UTC (rev 2061)
@@ -7,3 +7,22 @@
  OUTPUT_ARCH(i386:x86-64)
  ENTRY(btext)
  SEARCH_DIR("/usr/lib");
+@@ -6,7 +6,7 @@
+ SECTIONS
+ {
+   /* Read-only sections, merged into text segment: */
+-  . = kernbase + 0x00100000 + SIZEOF_HEADERS;
++  . = kernbase + CONSTANT (MAXPAGESIZE) + SIZEOF_HEADERS;
+   .interp         : { *(.interp) }
+   .hash           : { *(.hash) }
+   .dynsym         : { *(.dynsym) }
+@@ -61,7 +61,8 @@
+   .eh_frame_hdr : { *(.eh_frame_hdr) }
+   /* Adjust the address for the data segment.  We want to adjust up to
+      the same address within the page on the next page up.  */
+-  . = DATA_SEGMENT_ALIGN(0x100000, 0x1000);
++  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1));
++  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+      the linker would then create the section even if it turns out to

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-12-04 17:19:54 UTC (rev 2060)
+++ trunk/kfreebsd-7/debian/changelog	2007-12-07 12:18:57 UTC (rev 2061)
@@ -8,6 +8,7 @@
   * arch/i386/586.config and arch/i386/586-smp.config: also support i686 CPU.
   * Changed building rules to be correctly buildable with current binutils
      - add 020_linker.diff and gen-ld-u-options 
+     - extend 912_binutils.diff
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 23 Oct 2007 17:20:02 +0200
 

Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff	2007-12-04 17:19:54 UTC (rev 2060)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff	2007-12-07 12:18:57 UTC (rev 2061)
@@ -7,3 +7,22 @@
  OUTPUT_ARCH(i386:x86-64)
  ENTRY(btext)
  SEARCH_DIR("/usr/lib");
+@@ -6,7 +6,7 @@
+ SECTIONS
+ {
+   /* Read-only sections, merged into text segment: */
+-  . = kernbase + 0x00100000 + SIZEOF_HEADERS;
++  . = kernbase + CONSTANT (MAXPAGESIZE) + SIZEOF_HEADERS;
+   .interp         : { *(.interp) }
+   .hash           : { *(.hash) }
+   .dynsym         : { *(.dynsym) }
+@@ -61,7 +61,8 @@
+   .eh_frame_hdr : { *(.eh_frame_hdr) }
+   /* Adjust the address for the data segment.  We want to adjust up to
+      the same address within the page on the next page up.  */
+-  . = DATA_SEGMENT_ALIGN(0x100000, 0x1000);
++  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1));
++  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+      the linker would then create the section even if it turns out to