diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-06 08:03:59 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-02-06 08:03:59 (GMT) |
| commit | ee12992547573e074ae531e20327ca1410041fb6 (patch) | |
| tree | d4c21491457866a90cefd5bb20adb6780beb8e69 /patches/glibc/2.25/110-sh-fix-gcc6.patch | |
| parent | a459a33936a9b71d8dbc147d82c00eef3354cfeb (diff) | |
| parent | 8995bb66f0cb73ee000e75475e41c8f88b87f267 (diff) | |
Merge pull request #576 from stilor/update-kernel-libc
Update kernel & glibc
Diffstat (limited to 'patches/glibc/2.25/110-sh-fix-gcc6.patch')
| -rw-r--r-- | patches/glibc/2.25/110-sh-fix-gcc6.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/glibc/2.25/110-sh-fix-gcc6.patch b/patches/glibc/2.25/110-sh-fix-gcc6.patch new file mode 100644 index 0000000..cacf390 --- /dev/null +++ b/patches/glibc/2.25/110-sh-fix-gcc6.patch @@ -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 + |