mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
glibc & eglibc: fix mips DT_MIPS_RLD_MAP checking
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic section if a --version-script sets _RLD_MAP to local. This is apparently a binutils bug, but libc shouldn't segfault in this case. Add sanity check on the entry to avoid segfault, fixes [BUGID #287]. Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
@@ -0,0 +1,21 @@
|
|||||||
|
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
|
||||||
|
section if a --version-script sets _RLD_MAP to local. This is apparently
|
||||||
|
a binutils bug, but libc shouldn't segfault in this case.
|
||||||
|
|
||||||
|
see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
|
||||||
|
|
||||||
|
9/19/2010 - added by Qing He <qing.he@intel.com>
|
||||||
|
---
|
||||||
|
diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
|
||||||
|
--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
|
||||||
|
+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
|
||||||
|
@@ -70,7 +70,8 @@
|
||||||
|
/* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
|
||||||
|
with the run-time address of the r_debug structure */
|
||||||
|
#define ELF_MACHINE_DEBUG_SETUP(l,r) \
|
||||||
|
-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
|
||||||
|
+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
|
||||||
|
+ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
|
||||||
|
*(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
|
||||||
|
(ElfW(Addr)) (r); \
|
||||||
|
} while (0)
|
||||||
@@ -2,13 +2,14 @@ require eglibc.inc
|
|||||||
|
|
||||||
DEPENDS += "gperf-native"
|
DEPENDS += "gperf-native"
|
||||||
FILESPATHPKG =. "eglibc-svn:"
|
FILESPATHPKG =. "eglibc-svn:"
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
SRCREV="10809"
|
SRCREV="10809"
|
||||||
EGLIBC_BRANCH="eglibc-2_12"
|
EGLIBC_BRANCH="eglibc-2_12"
|
||||||
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
|
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
|
||||||
file://eglibc-svn-arm-lowlevellock-include-tls.patch \
|
file://eglibc-svn-arm-lowlevellock-include-tls.patch \
|
||||||
file://IO-acquire-lock-fix.patch \
|
file://IO-acquire-lock-fix.patch \
|
||||||
file://shorten-build-commands.patch \
|
file://shorten-build-commands.patch \
|
||||||
|
file://mips-rld-map-check.patch \
|
||||||
file://etc/ld.so.conf \
|
file://etc/ld.so.conf \
|
||||||
file://generate-supported.mk"
|
file://generate-supported.mk"
|
||||||
S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
|
S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
|
||||||
|
section if a --version-script sets _RLD_MAP to local. This is apparently
|
||||||
|
a binutils bug, but libc shouldn't segfault in this case.
|
||||||
|
|
||||||
|
see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
|
||||||
|
|
||||||
|
9/19/2010 - added by Qing He <qing.he@intel.com>
|
||||||
|
---
|
||||||
|
diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
|
||||||
|
--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
|
||||||
|
+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
|
||||||
|
@@ -70,7 +70,8 @@
|
||||||
|
/* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
|
||||||
|
with the run-time address of the r_debug structure */
|
||||||
|
#define ELF_MACHINE_DEBUG_SETUP(l,r) \
|
||||||
|
-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
|
||||||
|
+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
|
||||||
|
+ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
|
||||||
|
*(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
|
||||||
|
(ElfW(Addr)) (r); \
|
||||||
|
} while (0)
|
||||||
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
|
|||||||
PACKAGES_DYNAMIC = "libc6*"
|
PACKAGES_DYNAMIC = "libc6*"
|
||||||
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
|
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
|
||||||
|
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
||||||
# the -isystem in bitbake.conf screws up glibc do_stage
|
# the -isystem in bitbake.conf screws up glibc do_stage
|
||||||
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
|
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
|
||||||
@@ -54,6 +54,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
|
|||||||
file://glibc-check_pf.patch;striplevel=0 \
|
file://glibc-check_pf.patch;striplevel=0 \
|
||||||
file://ldd-unbash.patch \
|
file://ldd-unbash.patch \
|
||||||
file://glibc-arm-IO-acquire-lock-fix.diff \
|
file://glibc-arm-IO-acquire-lock-fix.diff \
|
||||||
|
file://mips-rld-map-check.patch \
|
||||||
file://generic-bits_select.h \
|
file://generic-bits_select.h \
|
||||||
file://generic-bits_types.h \
|
file://generic-bits_types.h \
|
||||||
file://generic-bits_typesizes.h \
|
file://generic-bits_typesizes.h \
|
||||||
|
|||||||
Reference in New Issue
Block a user