mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-21 01:21:27 +00:00
Fix glibc build with GCC5/6.
Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
parent
3fc7c1ef69
commit
8f267b77ae
28
patches/glibc/2.24/110-sh-fix-gcc6.patch
Normal file
28
patches/glibc/2.24/110-sh-fix-gcc6.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Neyman <stilor@att.net>
|
||||
Date: Wed, 25 Jan 2017 21:46:53 -0800
|
||||
Subject: [PATCH] sh: conditional is false in dl-conflict.c
|
||||
|
||||
... ifdef it out, so that it doesn't create a call to abort().
|
||||
|
||||
Signed-off-by: Alexey Neyman <stilor@att.net>
|
||||
---
|
||||
sysdeps/sh/dl-machine.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
|
||||
index 449deea..2b468af 100644
|
||||
--- a/sysdeps/sh/dl-machine.h
|
||||
+++ b/sysdeps/sh/dl-machine.h
|
||||
@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
||||
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.9.3
|
||||
|
Loading…
x
Reference in New Issue
Block a user