@@ -302,19 +302,22 @@ if(FUCHSIA_SDK)
302302 set (LLVM_RUNTIME_MULTILIB_hwasan+noexcept_TARGETS "aarch64-unknown-fuchsia;riscv64-unknown-fuchsia" CACHE STRING "" )
303303endif ()
304304
305- foreach (target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.main-none-eabi)
305+ foreach (target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.main-none-eabi;aarch64-none-elf )
306306 list (APPEND BUILTIN_TARGETS "${target} " )
307307 set (BUILTINS_${target} _CMAKE_SYSTEM_NAME Generic CACHE STRING "" )
308308 set (BUILTINS_${target} _CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "" )
309309 set (BUILTINS_${target} _CMAKE_SYSROOT "" CACHE STRING "" )
310310 set (BUILTINS_${target} _CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "" )
311311 foreach (lang C;CXX;ASM)
312- set (BUILTINS_${target} _CMAKE_${lang} _local_flags "--target=${target} -mthumb" )
312+ set (BUILTINS_${target} _CMAKE_${lang} _local_flags "--target=${target} " )
313+ if (NOT ${target} STREQUAL "aarch64-none-elf" )
314+ set (BUILTINS_${target} _CMAKE_${lang} _local_flags "${BUILTINS_${target} _CMAKE_${lang} _local_flags} -mthumb" )
315+ endif ()
313316 if (${target} STREQUAL "armv8m.main-none-eabi" )
314- set (BUILTINS_${target} _CMAKE_${lang} _local_flags "${BUILTINS_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "" )
317+ set (BUILTINS_${target} _CMAKE_${lang} _local_flags "${BUILTINS_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" )
315318 endif ()
316319 if (${target} STREQUAL "armv8.1m.main-none-eabi" )
317- set (BUILTINS_${target} _CMAKE_${lang} _local_flags "${BUILTINS_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "" )
320+ set (BUILTINS_${target} _CMAKE_${lang} _local_flags "${BUILTINS_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" )
318321 endif ()
319322 set (BUILTINS_${target} _CMAKE_${lang} _FLAGS "${BUILTINS_${target} _CMAKE_${lang} _local_flags}" CACHE STRING "" )
320323 endforeach ()
@@ -332,12 +335,15 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
332335 foreach (lang C;CXX;ASM)
333336 # TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
334337 # These should be addressed and removed over time.
335- set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "--target=${target} -mthumb -Wno-atomic-alignment \" -Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \" -Dfprintf(stream, format, ...)=printf(format)\" \" -Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1" )
338+ set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "--target=${target} -Wno-atomic-alignment \" -Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \" -Dfprintf(stream, format, ...)=printf(format)\" \" -Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1" )
339+ if (NOT ${target} STREQUAL "aarch64-none-elf" )
340+ set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "${RUNTIMES_${target} _CMAKE_${lang} _local_flags} -mthumb" )
341+ endif ()
336342 if (${target} STREQUAL "armv8m.main-none-eabi" )
337- set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "${RUNTIMES_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "" )
343+ set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "${RUNTIMES_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" )
338344 endif ()
339345 if (${target} STREQUAL "armv8.1m.main-none-eabi" )
340- set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "${RUNTIMES_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "" )
346+ set (RUNTIMES_${target} _CMAKE_${lang} _local_flags "${RUNTIMES_${target} _CMAKE_${lang} _local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" )
341347 endif ()
342348 set (RUNTIMES_${target} _CMAKE_${lang} _FLAGS "${RUNTIMES_${target} _CMAKE_${lang} _local_flags}" CACHE STRING "" )
343349 endforeach ()
0 commit comments