[Glibc-bsd-commits] r3812 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Fri Nov 4 16:01:02 UTC 2011
Author: rmh
Date: 2011-11-04 16:01:01 +0000 (Fri, 04 Nov 2011)
New Revision: 3812
Added:
trunk/kfreebsd-8/debian/patches/000_linker.diff
Removed:
trunk/kfreebsd-10/debian/gen-ld-u-options
trunk/kfreebsd-10/debian/patches/020_linker.diff
trunk/kfreebsd-8/debian/gen-ld-u-options
trunk/kfreebsd-8/debian/patches/020_linker.diff
trunk/kfreebsd-9/debian/gen-ld-u-options
trunk/kfreebsd-9/debian/patches/020_linker.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/series
trunk/kfreebsd-10/debian/rules
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-8/debian/rules
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/series
trunk/kfreebsd-9/debian/rules
Log:
Remove gen-ld-u-options / 020_linker.diff kludge, since it's been fixed upstream. Replace it with backport of upstream fix (r215137) when necessary.
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-10/debian/changelog 2011-11-04 16:01:01 UTC (rev 3812)
@@ -2,8 +2,10 @@
* Replace sed kludge with a pair of patches (920_linux_cflags.diff and
008_verioned_freebsd_macro.diff).
+ * Remove gen-ld-u-options / 020_linker.diff kludge, not needed since
+ upstream fixed this (r215137).
- -- Robert Millan <rmh at debian.org> Thu, 03 Nov 2011 16:38:13 +0100
+ -- Robert Millan <rmh at debian.org> Fri, 04 Nov 2011 16:59:02 +0100
kfreebsd-10 (10.0~svn226872-2) experimental; urgency=low
Deleted: trunk/kfreebsd-10/debian/gen-ld-u-options
===================================================================
--- trunk/kfreebsd-10/debian/gen-ld-u-options 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-10/debian/gen-ld-u-options 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,6 +0,0 @@
-#!/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
Deleted: trunk/kfreebsd-10/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/020_linker.diff 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-10/debian/patches/020_linker.diff 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,32 +0,0 @@
-
- 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
-
-
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
-@@ -93,7 +93,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"
- @${SYSTEM_CTFMERGE}
- .if !defined(DEBUG)
- ${OBJCOPY} --strip-debug ${.TARGET}
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -189,7 +189,9 @@
-
- .if ${__KLD_SHARED} == yes
- ${FULLPROG}: ${KMOD}.kld
-- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+ gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+ ${LD} -Bshareable -z common-page-size=8192 ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
-+ ${OBJCOPY} --remove-section=.comment ${.TARGET}
- .if !defined(DEBUG_FLAGS)
- ${OBJCOPY} --strip-debug ${.TARGET}
- .endif
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-10/debian/patches/series 2011-11-04 16:01:01 UTC (rev 3812)
@@ -7,7 +7,6 @@
#007_clone_signals.diff
008_verioned_freebsd_macro.diff
#009_disable_duped_modules.diff
-020_linker.diff
#107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-10/debian/rules 2011-11-04 16:01:01 UTC (rev 3812)
@@ -84,8 +84,6 @@
mkdir $(CURDIR)/src
cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
- install debian/gen-ld-u-options src/usr.sbin/config
-
touch src-stamp
build-indep: build-indep-stamp
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-8/debian/changelog 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,3 +1,10 @@
+kfreebsd-8 (8.2-13) UNRELEASED; urgency=low
+
+ * Remove gen-ld-u-options / 020_linker.diff kludge, replace it with
+ backport of upstream fix (r215137).
+
+ -- Robert Millan <rmh at debian.org> Fri, 04 Nov 2011 16:59:53 +0100
+
kfreebsd-8 (8.2-12) unstable; urgency=low
* Enable TEKEN_XTERM.
Deleted: trunk/kfreebsd-8/debian/gen-ld-u-options
===================================================================
--- trunk/kfreebsd-8/debian/gen-ld-u-options 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-8/debian/gen-ld-u-options 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,6 +0,0 @@
-#!/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
Added: trunk/kfreebsd-8/debian/patches/000_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_linker.diff (rev 0)
+++ trunk/kfreebsd-8/debian/patches/000_linker.diff 2011-11-04 16:01:01 UTC (rev 3812)
@@ -0,0 +1,30 @@
+
+ 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
+
+ Backported from HEAD (r215137)
+
+--- a/sys/sys/cdefs.h
++++ b/sys/sys/cdefs.h
+@@ -396,6 +396,9 @@
+ #endif /* __STDC__ */
+ #endif /* __GNUC__ || __INTEL_COMPILER */
+
++#define __GLOBL1(sym) __asm__(".globl " #sym)
++#define __GLOBL(sym) __GLOBL1(sym)
++
+ #if defined(__GNUC__) || defined(__INTEL_COMPILER)
+ #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"")
+ #else
+--- a/sys/sys/linker_set.h
++++ b/sys/sys/linker_set.h
+@@ -45,6 +45,8 @@
+ */
+ #ifdef __GNUCLIKE___SECTION
+ #define __MAKE_SET(set, sym) \
++ __GLOBL(__CONCAT(__start_set_,set)); \
++ __GLOBL(__CONCAT(__stop_set_,set)); \
+ static void const * const __set_##set##_sym_##sym \
+ __section("set_" #set) __used = &sym
+ #else /* !__GNUCLIKE___SECTION */
Deleted: trunk/kfreebsd-8/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,37 +0,0 @@
-
- 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
-
-
----
- sys/conf/kern.post.mk | 4 +++-
- sys/conf/kmod.mk | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
-@@ -85,7 +85,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(CTFMERGE)
- ${SYSTEM_CTFMERGE}
- .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -180,7 +180,9 @@
-
- .if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips
- ${FULLPROG}: ${KMOD}.kld
-- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+ gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+ ${LD} -Bshareable -z common-page-size=8192 ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
-+ ${OBJCOPY} --remove-section=.comment ${.TARGET}
- .if !defined(DEBUG_FLAGS)
- ${OBJCOPY} --strip-debug ${.TARGET}
- .endif
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-8/debian/patches/series 2011-11-04 16:01:01 UTC (rev 3812)
@@ -7,6 +7,7 @@
000_unix_socket_overflow.diff
000_teken_backport.diff
000_syscons_backport.diff
+000_linker.diff
001_misc.diff
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
@@ -15,7 +16,6 @@
008_config.diff
#009_disable_duped_modules.diff
013_ip_packed.diff
-020_linker.diff
021_superpages_i386.diff
103_stat_pipe.diff
105_apm_amd64.diff
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-8/debian/rules 2011-11-04 16:01:01 UTC (rev 3812)
@@ -99,8 +99,6 @@
-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
; done)
- install debian/gen-ld-u-options src/usr.sbin/config
-
touch src-stamp
build-indep: build-indep-stamp
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-9/debian/changelog 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0~svn226626-3) UNRELEASED; urgency=low
+
+ * Remove gen-ld-u-options / 020_linker.diff kludge, not needed since
+ upstream fixed this (r215137).
+
+ -- Robert Millan <rmh at debian.org> Fri, 04 Nov 2011 16:59:25 +0100
+
kfreebsd-9 (9.0~svn226626-2) experimental; urgency=low
* Remove 907_cpu_class.diff (it breaks FreeBSD userland when running
Deleted: trunk/kfreebsd-9/debian/gen-ld-u-options
===================================================================
--- trunk/kfreebsd-9/debian/gen-ld-u-options 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-9/debian/gen-ld-u-options 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,6 +0,0 @@
-#!/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
Deleted: trunk/kfreebsd-9/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/020_linker.diff 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-9/debian/patches/020_linker.diff 2011-11-04 16:01:01 UTC (rev 3812)
@@ -1,32 +0,0 @@
-
- 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
-
-
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
-@@ -93,7 +93,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"
- @${SYSTEM_CTFMERGE}
- .if !defined(DEBUG)
- ${OBJCOPY} --strip-debug ${.TARGET}
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -189,7 +189,9 @@
-
- .if ${__KLD_SHARED} == yes
- ${FULLPROG}: ${KMOD}.kld
-- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+ gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+ ${LD} -Bshareable -z common-page-size=8192 ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
-+ ${OBJCOPY} --remove-section=.comment ${.TARGET}
- .if !defined(DEBUG_FLAGS)
- ${OBJCOPY} --strip-debug ${.TARGET}
- .endif
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-9/debian/patches/series 2011-11-04 16:01:01 UTC (rev 3812)
@@ -6,7 +6,6 @@
006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
-020_linker.diff
#107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules 2011-11-03 15:38:38 UTC (rev 3811)
+++ trunk/kfreebsd-9/debian/rules 2011-11-04 16:01:01 UTC (rev 3812)
@@ -96,8 +96,6 @@
-e 's/#\s*ifndef\s*\(__linux__\|linux\)\(\s\|$$\)/#if 1/g' \
; done)
- install debian/gen-ld-u-options src/usr.sbin/config
-
touch src-stamp
build-indep: build-indep-stamp
More information about the Glibc-bsd-commits
mailing list