Skip to content

Commit adcc7e6

Browse files
committed
Sync target arch CPU with the devboard (armv8l) for llvm-clang-ubuntu-x-aarch64-pauth builder.
1 parent a811e79 commit adcc7e6

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3967,8 +3967,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
39673967
"TOOLCHAIN_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
39683968
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_pauth)s"),
39693969
"TOOLCHAIN_TARGET_COMPILER_FLAGS" : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret",
3970-
"REMOTE_TEST_HOST" : util.Interpolate("%(prop:remote_test_host_pauth)s"),
3971-
"REMOTE_TEST_USER" : util.Interpolate("%(prop:remote_test_user)s"),
39723970
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
39733971
"CMAKE_C_COMPILER_LAUNCHER" : "ccache",
39743972
"CMAKE_CXX_COMPILER_LAUNCHER" : "ccache",
@@ -3985,14 +3983,14 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
39853983
TestSuiteBuilder.getLlvmTestSuiteSteps(
39863984
cmake_definitions = {
39873985
"CMAKE_BUILD_TYPE" : "Release",
3988-
"CMAKE_C_FLAGS" : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -O2",
3989-
"CMAKE_CXX_FLAGS" : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -O2",
3986+
"CMAKE_C_FLAGS" : "-march=armv8l+pauth -mbranch-protection=pac-ret -O2",
3987+
"CMAKE_CXX_FLAGS" : "-march=armv8l+pauth -mbranch-protection=pac-ret -O2",
39903988
"CMAKE_EXE_LINKER_FLAGS" : "-O2 -Wl,--emit-relocs",
39913989
"CMAKE_MODULE_LINKER_FLAGS" : "-O2 -Wl,--emit-relocs",
39923990
"CMAKE_SHARED_LINKER_FLAGS" : "-O2 -Wl,--emit-relocs",
39933991
# Run on the devkit, limited set of tests.
39943992
"TEST_SUITE_REMOTE_HOST" : "[email protected]",
3995-
"TEST_SUITE_LIT_FLAGS" : "-v -vv --threads=16 --time-tests --filter-out=aarch64-acle-fmv-features",
3993+
"TEST_SUITE_LIT_FLAGS" : "-v -vv --threads=16 --time-tests",
39963994
"TEST_SUITE_RUN_BENCHMARKS" : "ON",
39973995
"TEST_SUITE_COLLECT_CODE_SIZE" : "OFF",
39983996
"TEST_SUITE_SUBDIRS" : "SingleSource;MultiSource;MicroBenchmarks;External",

0 commit comments

Comments
 (0)