[Glibc-bsd-commits] r2051 - in trunk/kfreebsd-7/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-12-03 08:02:48 +0000 (Mon, 03 Dec 2007)
New Revision: 2051

Added:
   trunk/kfreebsd-7/debian/gen-ld-u-options
   trunk/kfreebsd-7/debian/patches/020_linker.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
   trunk/kfreebsd-7/debian/rules
Log:
* change building rules also for kfreebsd-7



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-11-30 17:42:35 UTC (rev 2050)
+++ trunk/kfreebsd-7/debian/changelog	2007-12-03 08:02:48 UTC (rev 2051)
@@ -1,13 +1,13 @@
-kfreebsd-7 (7.0~cvs200711xx-1) UNRELEASED; urgency=low
+kfreebsd-7 (7.0~cvs200712xx-1) UNRELEASED; urgency=low
 
-  * BEWARE - kernel modules are not built correctly with current binutils !!! 
-
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_7
      - refresh of some patches
   * Reorder freebsd6-buildutils and freebsd7-buildutils in Build-Depends
   * Add build-dependency on quilt, and use quilt in debian/rules
   * 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 
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 23 Oct 2007 17:20:02 +0200
 

Copied: trunk/kfreebsd-7/debian/gen-ld-u-options (from rev 2050, trunk/kfreebsd-6/debian/gen-ld-u-options)
===================================================================
--- trunk/kfreebsd-7/debian/gen-ld-u-options	                        (rev 0)
+++ trunk/kfreebsd-7/debian/gen-ld-u-options	2007-12-03 08:02:48 UTC (rev 2051)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
+do
+	echo -n " -u __start_$i -u __stop_$i "
+done

Copied: trunk/kfreebsd-7/debian/patches/020_linker.diff (from rev 2050, trunk/kfreebsd-6/debian/patches/020_linker.diff)
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff	2007-12-03 08:02:48 UTC (rev 2051)
@@ -0,0 +1,33 @@
+
+  current ld provides magic symbols with names like __start_* and __stop_*
+  only if they are referenced, FreeBSD kernel needs them,
+  for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
+
+
+diff -u sys/conf/kern.post.mk sys/conf/kern.post.mk
+--- sys/conf/kern.post.mk
++++ sys/conf/kern.post.mk
+@@ -82,7 +92,9 @@
+ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
+ 	@rm -f ${.TARGET}
+ 	@echo linking ${.TARGET}
+-	${SYSTEM_LD}
++	${SYSTEM_LD} -o ${.TARGET}.tmp
++	gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
++	${SYSTEM_LD} "@${.TARGET}.lopt"
+ .if !defined(DEBUG)
+ 	${OBJCOPY} --strip-debug ${.TARGET}
+ .endif
+diff -u sys/conf/kmod.mk sys/conf/kmod.mk
+--- sys/conf/kmod.mk
++++ sys/conf/kmod.mk
+@@ -179,7 +179,8 @@
+ 
+ .if ${MACHINE_ARCH} != amd64
+ ${FULLPROG}: ${KMOD}.kld
+-	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
++	gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
++	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
+ .if !defined(DEBUG_FLAGS)
+ 	${OBJCOPY} --strip-debug ${.TARGET}
+ .endif

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2007-11-30 17:42:35 UTC (rev 2050)
+++ trunk/kfreebsd-7/debian/patches/series	2007-12-03 08:02:48 UTC (rev 2051)
@@ -8,6 +8,7 @@
 010_ET_DYN.diff -p0
 013_ip_packed.diff -p0
 017_oss_compat.diff -p0
+020_linker.diff -p0
 902_version.diff -p0
 903_disable_non-free_drivers.diff -p0
 904_dev_full.diff -p0

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2007-11-30 17:42:35 UTC (rev 2050)
+++ trunk/kfreebsd-7/debian/rules	2007-12-03 08:02:48 UTC (rev 2051)
@@ -72,6 +72,8 @@
 	; done)
 	
 	set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
+	install debian/gen-ld-u-options src/usr.sbin/config
+	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c
 
 	touch src-stamp
 
@@ -104,7 +106,6 @@
 
 config: src
 	cp -af src/usr.sbin/config config
-	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > config/sbuf.c
 	$(MAKE) -C config
 
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)