[Glibc-bsd-commits] r3513 - in trunk: kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2011-07-02 11:49:19 +0000 (Sat, 02 Jul 2011)
New Revision: 3513

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/912_binutils.diff
   trunk/kfreebsd-8/debian/rules
   trunk/kfreebsd-9/debian/rules
Log:
Extend ldscript non-kFreeBSD fix to support mipsel.

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-07-02 11:32:48 UTC (rev 3512)
+++ trunk/kfreebsd-8/debian/changelog	2011-07-02 11:49:19 UTC (rev 3513)
@@ -7,8 +7,9 @@
     a valid <sys/sbuf.h>.
   * Remove drivers for USB devices from kernel, now that devd autoloads
     them.
+  * Extend ldscript non-kFreeBSD fix to support mipsel.
 
- -- Robert Millan <rmh at debian.org>  Wed, 29 Jun 2011 13:09:45 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 02 Jul 2011 13:48:38 +0200
 
 kfreebsd-8 (8.2-3) unstable; urgency=medium
 

Modified: trunk/kfreebsd-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff	2011-07-02 11:32:48 UTC (rev 3512)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff	2011-07-02 11:49:19 UTC (rev 3513)
@@ -19,7 +19,7 @@
    .interp         : { *(.interp) }
    .hash           : { *(.hash) }
    .dynsym         : { *(.dynsym) }
-@@ -61,7 +61,8 @@ SECTIONS
+@@ -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.  */
@@ -29,3 +29,16 @@
    /* 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
+--- a/sys/conf/ldscript.mips
++++ b/sys/conf/ldscript.mips
+@@ -30,8 +30,8 @@
+  * $FreeBSD$
+  */
+ 
+-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", 
+-		"elf32-tradlittlemips")
++OUTPUT_FORMAT("elf32-tradbigmips-freebsd", "elf32-tradbigmips-freebsd", 
++		"elf32-tradlittlemips-freebsd")
+ 
+ OUTPUT_ARCH(mips)
+ ENTRY(_start)

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-07-02 11:32:48 UTC (rev 3512)
+++ trunk/kfreebsd-8/debian/rules	2011-07-02 11:49:19 UTC (rev 3513)
@@ -150,11 +150,12 @@
 
 	# Always set explicit link target to match with ld's implicit target (needed
 	# to build on non-kFreeBSD)
-ifeq ($(cpu), amd64)
-	sed -i -e 's/elf64-x86-64-freebsd/$(ld_target)/g' $(FLAVOR_DIR)-$*/sys/conf/ldscript.amd64
-else ifeq ($(cpu), i386)
-	sed -i -e 's/elf32-i386-freebsd/$(ld_target)/g' $(FLAVOR_DIR)-$*/sys/conf/ldscript.i386
-endif
+	sed -i \
+		-e 's/elf32-i386-freebsd/$(ld_target)/g' \
+		-e 's/elf64-x86-64-freebsd/$(ld_target)/g' \
+		-e 's/elf32-tradlittlemips-freebsd/$(ld_target)/g' \
+		-e 's/elf32-tradbigmips-freebsd/$(ld_target)/g' \
+	$(FLAVOR_DIR)-$*/sys/conf/ldscript.$(kfreebsd_cpu)
 
 	# Configure the kernel
 	cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-07-02 11:32:48 UTC (rev 3512)
+++ trunk/kfreebsd-9/debian/rules	2011-07-02 11:49:19 UTC (rev 3513)
@@ -152,11 +152,12 @@
 
 	# Always set explicit link target to match with ld's implicit target (needed
 	# to build on non-kFreeBSD)
-ifeq ($(cpu), amd64)
-	sed -i -e 's/elf64-x86-64-freebsd/$(ld_target)/g' $(FLAVOR_DIR)-$*/sys/conf/ldscript.amd64
-else ifeq ($(cpu), i386)
-	sed -i -e 's/elf32-i386-freebsd/$(ld_target)/g' $(FLAVOR_DIR)-$*/sys/conf/ldscript.i386
-endif
+	sed -i \
+		-e 's/elf32-i386-freebsd/$(ld_target)/g' \
+		-e 's/elf64-x86-64-freebsd/$(ld_target)/g' \
+		-e 's/elf32-tradlittlemips-freebsd/$(ld_target)/g' \
+		-e 's/elf32-tradbigmips-freebsd/$(ld_target)/g' \
+	$(FLAVOR_DIR)-$*/sys/conf/ldscript.$(kfreebsd_cpu)
 
 	# Configure the kernel
 	cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/