From: Waldemar Brodkorb <wbx@openadk.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] glibc: fix sh4 compile issue
Date: Thu, 13 Apr 2017 07:07:32 +0200 [thread overview]
Message-ID: <20170413050732.GA11817@waldemar-brodkorb.de> (raw)
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9756
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
v1->v2:
- add patches for 2.23/2.25, requested by Arnout
In the past I remember some discussions about removing version
selection for all C libraries. Any idea why we still have more than
one glibc version?
---
package/glibc/2.23/0001-sh4-fix.patch | 17 +++++++++++++++++
package/glibc/2.24/0001-sh4-fix.patch | 17 +++++++++++++++++
package/glibc/2.25/0001-sh4-fix.patch | 17 +++++++++++++++++
3 files changed, 51 insertions(+)
create mode 100644 package/glibc/2.23/0001-sh4-fix.patch
create mode 100644 package/glibc/2.24/0001-sh4-fix.patch
create mode 100644 package/glibc/2.25/0001-sh4-fix.patch
diff --git a/package/glibc/2.23/0001-sh4-fix.patch b/package/glibc/2.23/0001-sh4-fix.patch
new file mode 100644
index 0000000..20bbfad
--- /dev/null
+++ b/package/glibc/2.23/0001-sh4-fix.patch
@@ -0,0 +1,17 @@
+Backport of
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur glibc-2.23.orig/sysdeps/sh/dl-machine.h glibc-2.23/sysdeps/sh/dl-machine.h
+--- glibc-2.23.orig/sysdeps/sh/dl-machine.h 2016-02-18 18:54:00.000000000 +0100
++++ glibc-2.23/sysdeps/sh/dl-machine.h 2017-04-13 06:33:14.967668965 +0200
+@@ -389,7 +389,7 @@
+ break;
+ case R_SH_DIR32:
+ {
+-#ifndef RTLD_BOOTSTRAP
++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
+ /* This is defined in rtld.c, but nowhere in the static
+ libc.a; make the reference weak so static programs can
+ still link. This declaration cannot be done when
diff --git a/package/glibc/2.24/0001-sh4-fix.patch b/package/glibc/2.24/0001-sh4-fix.patch
new file mode 100644
index 0000000..3c22e01
--- /dev/null
+++ b/package/glibc/2.24/0001-sh4-fix.patch
@@ -0,0 +1,17 @@
+Backport of
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur glibc-2.24.orig/sysdeps/sh/dl-machine.h glibc-2.24/sysdeps/sh/dl-machine.h
+--- glibc-2.24.orig/sysdeps/sh/dl-machine.h 2016-08-02 04:01:36.000000000 +0200
++++ glibc-2.24/sysdeps/sh/dl-machine.h 2017-04-10 21:53:51.413196297 +0200
+@@ -389,7 +389,7 @@
+ break;
+ case R_SH_DIR32:
+ {
+-#ifndef RTLD_BOOTSTRAP
++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
+ /* This is defined in rtld.c, but nowhere in the static
+ libc.a; make the reference weak so static programs can
+ still link. This declaration cannot be done when
diff --git a/package/glibc/2.25/0001-sh4-fix.patch b/package/glibc/2.25/0001-sh4-fix.patch
new file mode 100644
index 0000000..60d25c4
--- /dev/null
+++ b/package/glibc/2.25/0001-sh4-fix.patch
@@ -0,0 +1,17 @@
+Backport of
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur glibc-2.25.orig/sysdeps/sh/dl-machine.h glibc-2.25/sysdeps/sh/dl-machine.h
+--- glibc-2.25.orig/sysdeps/sh/dl-machine.h 2017-02-05 16:28:43.000000000 +0100
++++ glibc-2.25/sysdeps/sh/dl-machine.h 2017-04-12 19:49:12.501756097 +0200
+@@ -389,7 +389,7 @@
+ break;
+ case R_SH_DIR32:
+ {
+-#ifndef RTLD_BOOTSTRAP
++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
+ /* This is defined in rtld.c, but nowhere in the static
+ libc.a; make the reference weak so static programs can
+ still link. This declaration cannot be done when
--
2.1.4
next reply other threads:[~2017-04-13 5:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 5:07 Waldemar Brodkorb [this message]
2017-04-13 19:58 ` [Buildroot] [PATCH v2] glibc: fix sh4 compile issue Thomas Petazzoni
2017-04-24 19:25 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170413050732.GA11817@waldemar-brodkorb.de \
--to=wbx@openadk.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox