[glibc] 02/02: patches/hurd-i386/git-divdi.diff: New patch
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.26
in repository glibc.
commit 7b8374b4b343608b3b3a512eb3ed0ab45dde4798
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Sep 3 02:57:02 2017 +0000
patches/hurd-i386/git-divdi.diff: New patch
---
debian/changelog | 1 +
debian/patches/hurd-i386/git-divdi.diff | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 32 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6254f26..b265651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ glibc (2.26-0experimental0~ppa4) UNRELEASED; urgency=medium
- patches/hurd-i386/git-preadwritev2.diff: New patch.
- patches/hurd-i386/git-rtld-access.diff: New patch.
- patches/hurd-i386/git-rtld-sbrk.diff: New patch.
+ - patches/hurd-i386/git-divdi.diff: New patch.
-- Adam Conrad <adconrad@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600
diff --git a/debian/patches/hurd-i386/git-divdi.diff b/debian/patches/hurd-i386/git-divdi.diff
new file mode 100644
index 0000000..bf733d5
--- /dev/null
+++ b/debian/patches/hurd-i386/git-divdi.diff
@@ -0,0 +1,30 @@
+commit f85958a74d9e26e7e43a5d3e65d4d77ed47f55ea
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 04:58:00 2017 +0200
+
+ hurd: Fix libc link
+
+ This follows db3d848 ('Build divdi3 only for architecture that required
+ it').
+
+ * sysdeps/mach/hurd/i386/Makefile
+ [$(subdir) = csu] (sysdep_routines): New rule: divdi3 object.
+ [$(subdir) = csu] (sysdep-only-routines): Likewise.
+ [$(subdir) = csu] (CFLAGS-divdi3.c): Likewise.
+
+diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
+index 5f988097c2..938d3b046d 100644
+--- a/sysdeps/mach/hurd/i386/Makefile
++++ b/sysdeps/mach/hurd/i386/Makefile
+@@ -6,3 +6,11 @@ endif
+ ifeq ($(subdir),debug)
+ gen-as-const-headers += signal-defines.sym
+ endif
++
++ifeq ($(subdir),csu)
++ifeq (yes,$(build-shared))
++sysdep_routines += divdi3
++shared-only-routines += divdi3
++CPPFLAGS-divdi3.c = -Din_divdi3_c
++endif
++endif
diff --git a/debian/patches/series b/debian/patches/series
index 8e9f113..188633a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -140,6 +140,7 @@ hurd-i386/git-bits_socket.h
hurd-i386/git-preadwritev2.diff
hurd-i386/git-rtld-access.diff
hurd-i386/git-rtld-sbrk.diff
+hurd-i386/git-divdi.diff
i386/local-biarch.diff
i386/unsubmitted-quiet-ldconfig.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: