aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 11:24:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 15:15:13 +0100
commit5c33b0a752e6168200776da61dee7d4d807ddbb0 (patch)
treec89d5d6e9c99b0c4d1664b675056c086ac14340b /meta/recipes-devtools/gcc/gcc-multilib-config.inc
parentfe26f809aaad5d5d608e841c99b817316c5a59a0 (diff)
downloadopenembedded-core-5c33b0a752e6168200776da61dee7d4d807ddbb0.tar.gz
gcc-multilib-config: Adapt mips for mips64 and different gcc versions
The location of some files for mips varies between gcc 4.9 and 5.2. Ensure that we cover both cases (and allow specified files to be optional). 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.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index cfad50fe1f..f7f9f557db 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -29,6 +29,7 @@ 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/*/linux.h' % src_conf_dir,
'%s/linux.h' % src_conf_dir)
# copy the target multilib config files to ${B}
@@ -80,7 +81,10 @@ python gcc_multilib_setup() {
return '"/%s/"' % libdir
for ml_conf_file in files:
- with open(root + '/' + ml_conf_file, 'r') as f:
+ fn = root + '/' + ml_conf_file
+ if not os.path.exists(fn):
+ continue
+ with open(fn, 'r') as f:
filelines = f.readlines()
# replace lines like
@@ -132,8 +136,8 @@ python gcc_multilib_setup() {
'x86_64' : ['gcc/config/i386/linux64.h'],
'i586' : ['gcc/config/i386/linux64.h'],
'i686' : ['gcc/config/i386/linux64.h'],
- 'mips' : ['gcc/config/mips/linux64.h'],
- 'mips64' : ['gcc/config/mips/linux64.h'],
+ 'mips' : ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
+ 'mips64' : ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
'powerpc' : ['gcc/config/rs6000/linux64.h'],
'powerpc64' : ['gcc/config/rs6000/linux64.h'],
}