packages: uClibc/uClibc.spec, uClibc/uClibc-nosize.patch (NEW), uClibc/uCli...

[arekm]

Author: arekm                        Date: Fri May 27 20:33:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gcc 4.6 fixes

---- Files affected:
packages/uClibc:
   uClibc.spec (1.199 -> 1.200) , uClibc-nosize.patch (NONE -> 1.1)  (NEW), uClibc-warn-once.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/uClibc/uClibc.spec
diff -u packages/uClibc/uClibc.spec:1.199 packages/uClibc/uClibc.spec:1.200
--- packages/uClibc/uClibc.spec:1.199	Thu May 19 20:16:13 2011
+++ packages/uClibc/uClibc.spec	Fri May 27 22:32:57 2011
@@ -25,6 +25,8 @@
 Patch4:		%{name}-stdio-unhide.patch
 Patch5:		%{name}-inotify_init1.patch
 Patch6:		%{name}-sockflags.patch
+Patch7:		%{name}-nosize.patch
+Patch8:		%{name}-warn-once.patch
 URL:		http://uclibc.org/
 BuildRequires:	binutils-gasp
 BuildRequires:	cpp
@@ -86,6 +88,8 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 # ARCH is already determined by uname -m
 %ifarch %{ix86}
@@ -324,6 +328,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2011/05/27 20:32:57  arekm
+- gcc 4.6 fixes
+
 Revision 1.199  2011/05/19 18:16:13  arekm
 - rel 7; symlink more dirs available in llh package
 

================================================================
Index: packages/uClibc/uClibc-nosize.patch
diff -u /dev/null packages/uClibc/uClibc-nosize.patch:1.1
--- /dev/null	Fri May 27 22:33:03 2011
+++ packages/uClibc/uClibc-nosize.patch	Fri May 27 22:32:57 2011
@@ -0,0 +1,33 @@
+--- uClibc-0.9.30.3/libc/sysdeps/linux/i386/crtn.S~	2010-03-12 20:32:42.000000000 +0100
++++ uClibc-0.9.30.3/libc/sysdeps/linux/i386/crtn.S	2011-05-27 22:21:25.932407849 +0200
+@@ -6,7 +6,6 @@
+ 	popl	%ebx
+ 	popl	%ebp
+ 	ret
+-.size _init,.-_init
+ 
+ 
+ 
+@@ -16,7 +15,6 @@
+ 	popl	%ebx
+ 	popl	%ebp
+ 	ret
+-.size _fini,.-_fini
+ 
+ 
+ 
+--- uClibc-0.9.30.3/libc/sysdeps/linux/x86_64/crtn.S~	2010-03-12 20:32:42.000000000 +0100
++++ uClibc-0.9.30.3/libc/sysdeps/linux/x86_64/crtn.S	2011-05-27 22:21:50.250189687 +0200
+@@ -7,7 +7,6 @@
+ .type    _init, %function
+ 	addq $8, %rsp
+ 	ret
+-.size _init,.-_init
+ 
+ 
+ .section .fini
+@@ -15,4 +14,3 @@
+ .type    _fini, %function
+ 	addq $8, %rsp
+ 	ret
+-.size _fini, .-_fini

================================================================
Index: packages/uClibc/uClibc-warn-once.patch
diff -u /dev/null packages/uClibc/uClibc-warn-once.patch:1.1
--- /dev/null	Fri May 27 22:33:03 2011
+++ packages/uClibc/uClibc-warn-once.patch	Fri May 27 22:32:57 2011
@@ -0,0 +1,49 @@
+commit 00d805f334c009164d7cecab931086a0545af8d1
+Author: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
+Date:   Fri Oct 9 18:10:50 2009 +0200
+
+    check_ld some more flags
+    
+      gold does not currently implement these.
+    
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
+
+diff --git a/Rules.mak b/Rules.mak
+index d64897f..ceb1e10 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -282,7 +282,7 @@ endif
+ 	# Idx Name          Size      VMA       LMA       File off  Algn
+ 	#   0 .text         xxxxxxxx  00000000  00000000  xxxxxxxx  2**2 <===!
+ 	CPU_CFLAGS-y  += $(call check_gcc,-ffunction-sections -fdata-sections,)
+-ifneq ($(call check_ld,--sort-common,),)
++ifneq ($(call check_ld,--sort-common),)
+ 	CPU_LDFLAGS-y += -Wl,--sort-common
+ endif
+ ifneq ($(call check_ld,--sort-section alignment),)
+@@ -547,8 +547,11 @@ ifneq ($(HAVE_SHARED),y)
+ CFLAGS += -DSTATIC
+ endif
+ 
++LDFLAG_WARN_ONCE:=$(if $(call check_ld,--warn-once),-Wl$(comma)--warn-once)
++LDFLAG_SORT_COMMON:=$(if $(call check_ld,--sort-common),-Wl$(comma)--sort-common)
++LDFLAG_DISCARD_ALL:=$(if $(call check_ld,--discard-all),-Wl$(comma)--discard-all)
+ LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared \
+-	-Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc
++	-Wl,--warn-common $(LDFLAG_WARN_ONCE) -Wl,-z,combreloc
+ # binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
+ #LDFLAGS_NOSTRIP+=$(call check_ld,--gc-sections)
+ 
+diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
+index 350cc81..9e228b7 100644
+--- a/ldso/ldso/Makefile.in
++++ b/ldso/ldso/Makefile.in
+@@ -35,7 +35,7 @@ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS)
+ else
+ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
+ endif
+-LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,_start -Wl,-z,now -Wl,-Bsymbolic -Wl,--export-dynamic -Wl,--sort-common -Wl,--discard-locals -Wl,--discard-all -Wl,--no-undefined
++LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,_start -Wl,-z,now -Wl,-Bsymbolic -Wl,--export-dynamic $(LDFLAG_SORT_COMMON) -Wl,--discard-locals $(LDFLAG_DISCARD_ALL) -Wl,--no-undefined
+ 
+ ldso_FULL_NAME := $(UCLIBC_LDSO_NAME)-$(VERSION).so
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc.spec?r1=1.199&r2=1.200&f=u