r6586 - in glibc-package/branches/glibc-2.22/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-09-18 01:20:02 +0000 (Fri, 18 Sep 2015)
New Revision: 6586
Added:
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
hurd-i386/cvs-csu_crt0.diff: New patch, fixes gcrt0.o build.
hurd-i386/cvs-s_scalbn.diff: New patch, fixes s_scalbn.S build.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-18 01:19:34 UTC (rev 6585)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-18 01:20:02 UTC (rev 6586)
@@ -54,6 +54,10 @@
* debian/patches/hurd-i386/cvs-warnings.diff: Upstreamed.
* debian/patches/hurd-i386/cvs-check-local-headers.diff: Upstreamed.
* debian/patches/hurd-i386/cvs-mlock.diff: Upstreamed.
+ * debian/patches/hurd-i386/cvs-csu_crt0.diff: New patch, fixes gcrt0.o
+ build.
+ * debian/patches/hurd-i386/cvs-s_scalbn.diff: New patch, fixes s_scalbn.S
+ build.
-- Adam Conrad <adconrad@0c3.net> Tue, 15 Sep 2015 17:57:41 -0600
Added: glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff (rev 0)
+++ glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff 2015-09-18 01:20:02 UTC (rev 6586)
@@ -0,0 +1,49 @@
+commit edd4cbcf83fb466dd8a1b5d63d55b1fea96356fe
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Aug 7 01:38:39 2015 +0200
+
+ Fix gcrt0.o compilation
+
+ When static-start-installed-name is different from
+ start-installed-name, we must not use the shared objects.
+
+ * csu/Makefile
+ (extra-objs): Add gmon-start.o when building shared library and
+ $(static-start-installed-name) is different from
+ $(start-installed-name).
+ $(objpfx)g$(static-start-installed-name): When building shared
+ library and $(static-start-installed-name) is different from
+ $(static-start-installed-name), revert to non-shared rule,
+ i.e. using $(objpfx)% and gmon-start.o.
+
+diff --git a/csu/Makefile b/csu/Makefile
+index 9f0855a..4df5d10 100644
+--- a/csu/Makefile
++++ b/csu/Makefile
+@@ -47,6 +47,9 @@ tests-static := tst-empty
+
+ ifeq (yes,$(build-shared))
+ extra-objs += S$(start-installed-name) gmon-start.os
++ifneq ($(start-installed-name),$(static-start-installed-name))
++extra-objs += gmon-start.o
++endif
+ install-lib += S$(start-installed-name)
+ generated += start.os
+ else
+@@ -98,10 +101,14 @@ endif
+ # startfile with gmon-start.o, which defines a constructor function
+ # to turn on profiling code at startup.
+ ifeq (yes,$(build-shared))
+-$(addprefix $(objpfx),$(sort g$(start-installed-name) \
+- g$(static-start-installed-name))): \
++$(objpfx)g$(start-installed-name): \
+ $(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os
+ $(link-relocatable)
++ifneq ($(start-installed-name),$(static-start-installed-name))
++$(objpfx)g$(static-start-installed-name): \
++ $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o
++ $(link-relocatable)
++endif
+ else
+ $(addprefix $(objpfx),$(sort g$(start-installed-name) \
+ g$(static-start-installed-name))): \
Added: glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff (rev 0)
+++ glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff 2015-09-18 01:20:02 UTC (rev 6586)
@@ -0,0 +1,21 @@
+commit 86955bf62e5690f65995ee8055b1ed529f80842b
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Aug 7 09:53:56 2015 +0200
+
+ Fix sysdeps/i386/fpu/s_scalbn.S build
+
+ * math/Versions (libc: GLIBC_2_22): New (empty) version set.
+
+diff --git a/math/Versions b/math/Versions
+index 513ab14..5ab9123 100644
+--- a/math/Versions
++++ b/math/Versions
+@@ -29,6 +29,8 @@ libc {
+ # s*
+ scalbln; scalblnf; scalblnl;
+ }
++ GLIBC_2.22 {
++ }
+ }
+
+ libm {
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 01:19:34 UTC (rev 6585)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 01:20:02 UTC (rev 6586)
@@ -134,6 +134,8 @@
hurd-i386/tg-sysheaders.diff
hurd-i386/cvs-bootstrap.diff
hurd-i386/local-bootstrap.diff
+hurd-i386/cvs-csu_crt0.diff
+hurd-i386/cvs-s_scalbn.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: