AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roll mips toolchain to gcc 8

Browse Source 
Just like https://skia-review.googlesource.com/c/skia/+/118681/,
but one more, and...

   - GCC now needs libisl19
   - more warnings to stifle... disable warnings-as-errors.

Cq-Include-Trybots: skia.primary:Build-Debian9-GCC-mips64el-Debug,Build-Debian9-GCC-mips64el-Release
Change-Id: I35c2f71caebb47bd1bd253923cbddbe3f9b95477
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245352
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-10-01 10:13:39 -05:00 committed by Skia Commit-Bot
parent 8c500751cd
commit 1e9112fbb4
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/assets/mips64el_toolchain_linux/VERSION
View File

@ -1 +1 @@
4
6

17
infra/bots/assets/mips64el_toolchain_linux/create.py
View File

@ -27,19 +27,20 @@ import utils
# straightforward as it should be.
PKGS = [
'binutils-mips64el-linux-gnuabi64',
'cpp-7-mips64el-linux-gnuabi64',
'g++-7-mips64el-linux-gnuabi64',
'gcc-7-cross-base',
'gcc-7-mips64el-linux-gnuabi64',
'gcc-7-mips64el-linux-gnuabi64-base',
'cpp-8-mips64el-linux-gnuabi64',
'g++-8-mips64el-linux-gnuabi64',
'gcc-8-cross-base',
'gcc-8-mips64el-linux-gnuabi64',
'gcc-8-mips64el-linux-gnuabi64-base',
'libatomic1-mips64el-cross',
'libc6-dev-mips64el-cross',
'libc6-mips64el-cross',
'libgcc-7-dev-mips64el-cross',
'libgcc-8-dev-mips64el-cross',
'libgcc1-mips64el-cross',
'libgomp1-mips64el-cross',
'libisl19',
'libmpfr6', # This is new in buster, so build machines don't have it yet.
'libstdc++-7-dev-mips64el-cross',
'libstdc++-8-dev-mips64el-cross',
'libstdc++6-mips64el-cross',
'linux-libc-dev-mips64el-cross',
]
@ -58,7 +59,7 @@ def create_asset(target_dir):
# Remove unnecessary files that cause problems with zipping (due to dangling
# symlinks).
os.remove(os.path.join(parent_dir,
'lib/gcc-cross/mips64el-linux-gnuabi64/7/libcc1.so'))
'lib/gcc-cross/mips64el-linux-gnuabi64/8/libcc1.so'))
shutil.rmtree(os.path.join(parent_dir, 'share'))
# Remove usr/ prefix.
for d in os.listdir(parent_dir):

10
infra/bots/recipe_modules/build/default.py
View File

@ -144,25 +144,21 @@ def compile_fn(api, checkout_root, out_dir):
if target_arch in ['mips64el', 'loongson3a']:
mips64el_toolchain_linux = str(api.vars.slave_dir.join(
'mips64el_toolchain_linux'))
cc = mips64el_toolchain_linux + '/bin/mips64el-linux-gnuabi64-gcc-7'
cxx = mips64el_toolchain_linux + '/bin/mips64el-linux-gnuabi64-g++-7'
cc = mips64el_toolchain_linux + '/bin/mips64el-linux-gnuabi64-gcc-8'
cxx = mips64el_toolchain_linux + '/bin/mips64el-linux-gnuabi64-g++-8'
env['LD_LIBRARY_PATH'] = (
mips64el_toolchain_linux + '/lib/x86_64-linux-gnu/')
extra_ldflags.append('-L' + mips64el_toolchain_linux +
'/mips64el-linux-gnuabi64/lib')
extra_cflags.extend([
'-Wno-format-truncation',
'-Wno-uninitialized',
('-DDUMMY_mips64el_toolchain_linux_version=%s' %
api.run.asset_version('mips64el_toolchain_linux', skia_dir))
])
if configuration == 'Release':
# This warning is only triggered when fuzz_canvas is inlined.
extra_cflags.append('-Wno-strict-overflow')
args.update({
'skia_use_system_freetype2': 'false',
'skia_use_fontconfig': 'false',
'skia_enable_gpu': 'false',
'werror': 'false',
})
else:
cc, cxx = 'gcc', 'g++'

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json
View File

@ -32,7 +32,7 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release/Release",
"--args=cc=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-gcc-7\" cxx=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-g++-7\" extra_cflags=[\"-Wno-format-truncation\", \"-Wno-uninitialized\", \"-DDUMMY_mips64el_toolchain_linux_version=42\", \"-Wno-strict-overflow\"] extra_ldflags=[\"-L[START_DIR]/mips64el_toolchain_linux/mips64el-linux-gnuabi64/lib\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"loongson3a\" werror=true"
"--args=cc=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-gcc-8\" cxx=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-g++-8\" extra_cflags=[\"-DDUMMY_mips64el_toolchain_linux_version=42\"] extra_ldflags=[\"-L[START_DIR]/mips64el_toolchain_linux/mips64el-linux-gnuabi64/lib\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"loongson3a\" werror=false"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {

8
infra/bots/tasks.json
View File

@ -8193,7 +8193,7 @@
{
"name": "skia/bots/mips64el_toolchain_linux",
"path": "mips64el_toolchain_linux",
"version": "version:4"
"version": "version:6"
}
],
"command": [
@ -8262,7 +8262,7 @@
{
"name": "skia/bots/mips64el_toolchain_linux",
"path": "mips64el_toolchain_linux",
"version": "version:4"
"version": "version:6"
}
],
"command": [
@ -8331,7 +8331,7 @@
{
"name": "skia/bots/mips64el_toolchain_linux",
"path": "mips64el_toolchain_linux",
"version": "version:4"
"version": "version:6"
}
],
"command": [
@ -8400,7 +8400,7 @@
{
"name": "skia/bots/mips64el_toolchain_linux",
"path": "mips64el_toolchain_linux",
"version": "version:4"
"version": "version:6"
}
],
"command": [