[OE-core] [PATCH] gcc-multilib-config: Adapt mips for mips64 and different gcc versions
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Jul 31 10:24:37 UTC 2015
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 at linuxfoundation.org>
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 2e746e5..bdf4be7 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'],
}
More information about the Openembedded-core
mailing list