diff options
| author | Ting Liu <ting.liu@freescale.com> | 2014-07-16 18:35:58 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:09:01 +0100 |
| commit | 01e556cd0dad84a926c6ee15587a287abaa1e6db (patch) | |
| tree | a763433fb3a0c3726dff1f93a632af2cd358a286 /meta/recipes-devtools/gcc/gcc-multilib-config.inc | |
| parent | c0585ca59aff5b662da236d0c7692113825e1593 (diff) | |
| download | poky-01e556cd0dad84a926c6ee15587a287abaa1e6db.tar.gz | |
gcc: update *LIBC_* linker relocation reglex
* GLIBC_DYNAMIC_LINKER64 reglex does not work for rs6000/linux64.h,
update it.
* it turns out that UCLIBC_DYNAMIC_LINKER reglex will strip the 32/64
chars from UCLIBC_DYNAMIC_LINKER64/UCLIBC_DYNAMIC_LINKER32, add '\b'.
my two PCs: Centos 6.5 (python 2.7.5) and Fedora 13 (python 2.7.3)
(From OE-Core rev: a0b408191d64804df1748163060313af31433ac8)
Signed-off-by: Ting Liu <ting.liu@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-multilib-config.inc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 81d664a1b3..acea6d8436 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc | |||
| @@ -88,8 +88,10 @@ python gcc_multilib_setup() { | |||
| 88 | substs = [ | 88 | substs = [ |
| 89 | (r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$', | 89 | (r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$', |
| 90 | r'\1' + wrap_libdir(libdir32) + r'\3'), | 90 | r'\1' + wrap_libdir(libdir32) + r'\3'), |
| 91 | (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$', | 91 | (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\"\S+\")$', |
| 92 | r'\1' + wrap_libdir(libdir64) + r'\3'), | 92 | r'\1' + wrap_libdir(libdir64) + r'\3'), |
| 93 | (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*\"\S+\"\s*)(\S+)(\s*\"\S+\"\s*)(\S+)(\s*\".*\")$', | ||
| 94 | r'\1' + wrap_libdir(libdir64) + r'\3' + wrap_libdir(libdir64) + r'\5'), | ||
| 93 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$', | 95 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$', |
| 94 | r'\1' + wrap_libdir(libdirx32) + r'\3'), | 96 | r'\1' + wrap_libdir(libdirx32) + r'\3'), |
| 95 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', | 97 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', |
| @@ -100,7 +102,7 @@ python gcc_multilib_setup() { | |||
| 100 | r'\1' + wrap_libdir(libdir64) + r'\3'), | 102 | r'\1' + wrap_libdir(libdir64) + r'\3'), |
| 101 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', | 103 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', |
| 102 | r'\1' + wrap_libdir(libdirn32) + r'\3'), | 104 | r'\1' + wrap_libdir(libdirn32) + r'\3'), |
| 103 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\s*)(\S+)(\s*\".*\")$', | 105 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$', |
| 104 | r'\1' + wrap_libdir(libdir32) + r'\3'), | 106 | r'\1' + wrap_libdir(libdir32) + r'\3'), |
| 105 | ] | 107 | ] |
| 106 | 108 | ||