summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-08-02 22:33:17 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 01:48:11 (GMT)
commitfe6d4dc0f25c48100d36d2010ab05cd35fa5a00b (patch)
treebfb638d1ade6d7ec46172d6c9fb79362f211c4d8
parente2bdd80985af08e1397800d868607ad52111cd09 (diff)
downloadpoky-fe6d4dc0f25c48100d36d2010ab05cd35fa5a00b.tar.gz
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>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc12
-rw-r--r--meta/recipes-devtools/gcc/gcc_4.5.1.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb2
4 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 6956677..7d8170c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.6.0 6# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 9f5ba33..869d1b6 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -64,11 +64,15 @@ SYSTEMLIBS1 = "${target_libdir}/"
64do_configure_prepend () { 64do_configure_prepend () {
65 # Change the default dynamic linker path, only useful for SDK, other's value 65 # Change the default dynamic linker path, only useful for SDK, other's value
66 # are not changed according to the SYSTEMLIBS_DIR 66 # are not changed according to the SYSTEMLIBS_DIR
67 #
68 # We want something like the following:
69 # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
70 # becomes
71 # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
72 #
67 sed -i ${S}/gcc/config/*/linux*.h -e \ 73 sed -i ${S}/gcc/config/*/linux*.h -e \
68 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#' 74 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
69 75
70 SYSTEMLIBS_DIR=`dirname ${SYSTEMLIBS}`
71 [ "$SYSTEMLIBS_DIR" = "/" ] && SYSTEMLIBS_DIR=""
72 # teach gcc to find correct target includedir when checking libc ssp support 76 # teach gcc to find correct target includedir when checking libc ssp support
73 mkdir -p ${B}/gcc 77 mkdir -p ${B}/gcc
74 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe 78 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
@@ -83,7 +87,7 @@ do_configure_prepend () {
83#ifndef STANDARD_STARTFILE_PREFIX_2 87#ifndef STANDARD_STARTFILE_PREFIX_2
84#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}" 88#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
85#endif 89#endif
86#define SYSTEMLIBS_DIR "$SYSTEMLIBS_DIR" 90#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
87#endif /* ! GCC_DEFAULTS_H */ 91#endif /* ! GCC_DEFAULTS_H */
88_EOF 92_EOF
89 mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h 93 mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index 12e42c4..f036cb1 100644
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
1PR = "r7" 1PR = "r8"
2require gcc-${PV}.inc 2require gcc-${PV}.inc
3require gcc-configure-target.inc 3require gcc-configure-target.inc
4require gcc-package-target.inc 4require gcc-package-target.inc
diff --git a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
index 2df12ef..9fd2b0a 100644
--- a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
1PR = "r4" 1PR = "r5"
2 2
3require gcc-${PV}.inc 3require gcc-${PV}.inc
4require gcc-configure-target.inc 4require gcc-configure-target.inc