sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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).

(From OE-Core rev: 5c33b0a752e6168200776da61dee7d4d807ddbb0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2015-07-31 11:24:37 +01:00
parent c125ef12ae
commit f494fc25ea
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-devtools/gcc/gcc-multilib-config.inc
View File

@ -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'],
}