[zorg] r282162 - [Zorg] Force -marm/-mthumb on ARM buildbots
Renato Golin via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 22 07:56:46 PDT 2016
Author: rengolin
Date: Thu Sep 22 09:56:46 2016
New Revision: 282162
URL: http://llvm.org/viewvc/llvm-project?rev=282162&view=rev
Log:
[Zorg] Force -marm/-mthumb on ARM buildbots
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=282162&r1=282161&r2=282162&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Sep 22 09:56:46 2016
@@ -168,8 +168,8 @@ def _get_clang_builders():
'--benchmarking-only', '--multisample=3',
'--exclude-stat-from-submission=compile',
'--make-param=RUNUNDER=taskset -c 1'],
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15'",
- "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"],
submitURL='http://llvm.org/perf/submitRun',
@@ -187,10 +187,10 @@ def _get_clang_builders():
useTwoStage=False,
runTestSuite=True,
env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- nt_flags=['--cflag', '-mcpu=cortex-a15',
+ nt_flags=['--cflag', '-mcpu=cortex-a15 -marm',
'--threads=2', '--build-threads=2'],
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15'",
- "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -206,8 +206,8 @@ def _get_clang_builders():
testStage1=False,
env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
- extra_cmake_args=["-DCMAKE_C_FLAGS=-mcpu=cortex-a15",
- "-DCMAKE_CXX_FLAGS=-mcpu=cortex-a15",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm''",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j2'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -221,8 +221,8 @@ def _get_clang_builders():
clean=False,
checkout_compiler_rt=False,
env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
- "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -253,8 +253,8 @@ def _get_clang_builders():
useTwoStage=True,
testStage1=False,
env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
- "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -745,9 +745,9 @@ def _get_sanitizer_builders():
jobs=4,
clean=False,
env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
- "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
- "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -1038,8 +1038,8 @@ def _get_libcxx_builders():
# See: libcxxabi/test/lit.cfg
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
- 'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
- 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15',
+ 'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -marm',
+ 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
'LLVM_PARALLEL_LINK_JOBS': '2'})},
{'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
@@ -1053,8 +1053,8 @@ def _get_libcxx_builders():
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
- 'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
- 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15',
+ 'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
+ 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
'LLVM_PARALLEL_LINK_JOBS': '2'})},
]
More information about the llvm-commits
mailing list