sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

gcc: Fix setting of GLIBC_DYNAMIC_LINKER 

The sed regex in do_configure_prepend was producing the following result:

 #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "/lib64/ld-linux-x86-64.so.2"

instead of removing the leading "/lib" or "/lib64".

Now we have it do:

 #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"

Additionally, with the regex fixed the manipulation of SYSTEMLIBS_DIR
needs to be removed.

(From OE-Core rev: b343436d03fa5690b16ee8ef5d4a738c5194b301)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kumar Gala 2011-08-02 17:33:17 -05:00 committed by Richard Purdie
parent 9a49eb78ec
commit be1f70d68b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/gcc/gcc-4.6.inc
View File

@ -1,6 +1,6 @@
require gcc-common.inc
PR = "r2"
PR = "r3"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0

12
meta/recipes-devtools/gcc/gcc-configure-common.inc
View File

@ -64,11 +64,15 @@ SYSTEMLIBS1 = "${target_libdir}/"
do_configure_prepend () {
# Change the default dynamic linker path, only useful for SDK, other's value
# are not changed according to the SYSTEMLIBS_DIR
#
# We want something like the following:
# #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
# becomes
# #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
#
sed -i ${S}/gcc/config/*/linux*.h -e \
's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
SYSTEMLIBS_DIR=`dirname ${SYSTEMLIBS}`
[ "$SYSTEMLIBS_DIR" = "/" ] && SYSTEMLIBS_DIR=""
# teach gcc to find correct target includedir when checking libc ssp support
mkdir -p ${B}/gcc
echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
@ -83,7 +87,7 @@ do_configure_prepend () {
#ifndef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
#endif
#define SYSTEMLIBS_DIR "$SYSTEMLIBS_DIR"
#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
#endif /* ! GCC_DEFAULTS_H */
_EOF
mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h

2
meta/recipes-devtools/gcc/gcc_4.5.1.bb
View File

@ -1,4 +1,4 @@
PR = "r7"
PR = "r8"
require gcc-${PV}.inc
require gcc-configure-target.inc
require gcc-package-target.inc

2
meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
View File

@ -1,4 +1,4 @@
PR = "r4"
PR = "r5"
require gcc-${PV}.inc
require gcc-configure-target.inc