[Buildroot] [PATCH] glibc: fix sh4 compile issue

[Buildroot] [PATCH] glibc: fix sh4 compile issue

[Waldemar Brodkorb]

Fixes:
  https://bugs.busybox.net/show_bug.cgi?id=9756

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/glibc/2.24/0001-sh4-fix.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/glibc/2.24/0001-sh4-fix.patch

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
-- 
2.1.4

[Buildroot] [PATCH] glibc: fix sh4 compile issue

[Arnout Vandecappelle]

On 11-04-17 22:14, Waldemar Brodkorb wrote:
> Fixes:
>   https://bugs.busybox.net/show_bug.cgi?id=9756
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/glibc/2.24/0001-sh4-fix.patch | 17 +++++++++++++++++

 Isn't the patch needed for 2.23 and 2.25 as well?

 Regards,
 Arnout

>  1 file changed, 17 insertions(+)
>  create mode 100644 package/glibc/2.24/0001-sh4-fix.patch
> 
> 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
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF