diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 12:52:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 13:11:25 +0100 |
| commit | 025ec5958b7e1fd71caa0079ec3c573126b30886 (patch) | |
| tree | 83943826b68d5c1875a366495bc53a486c8f7a7c /meta/recipes-devtools/gcc/gcc-multilib-config.inc | |
| parent | a29af8c20187a65fbdbbedd0b7158c07d3e713cf (diff) | |
| download | openembedded-core-025ec5958b7e1fd71caa0079ec3c573126b30886.tar.gz | |
gcc: Handle uclibc linker relocation for multilib support
We need to handle the UCLIBC_* linker variables in the same way
as we do the GLIBC_* ones to allow uclibc multilib to work properly.
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 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 1eafeb4768..81d664a1b3 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -26,7 +26,8 @@ python gcc_multilib_setup() { bb.utils.remove(build_conf_dir, True) ml_globs = ('%s/*/t-linux64' % src_conf_dir, - '%s/*/linux64.h' % src_conf_dir) + '%s/*/linux64.h' % src_conf_dir, + '%s/linux.h' % src_conf_dir) # copy the target multilib config files to ${B} for ml_glob in ml_globs: @@ -93,6 +94,14 @@ python gcc_multilib_setup() { r'\1' + wrap_libdir(libdirx32) + r'\3'), (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', r'\1' + wrap_libdir(libdirn32) + r'\3'), + (r'^(#define\s*UCLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$', + r'\1' + wrap_libdir(libdir32) + r'\3'), + (r'^(#define\s*UCLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$', + r'\1' + wrap_libdir(libdir64) + r'\3'), + (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', + r'\1' + wrap_libdir(libdirn32) + r'\3'), + (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\s*)(\S+)(\s*\".*\")$', + r'\1' + wrap_libdir(libdir32) + r'\3'), ] for (i, line) in enumerate(filelines): |