@@ -332,7 +332,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
332
332
foreach (lang C;CXX;ASM)
333
333
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
334
334
# 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)\" \" -Dtimeval=struct timeval{int tv_sec; int tv_usec;} \" \" - Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1" )
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" )
336
336
if (${target} STREQUAL "armv8m.main-none-eabi" )
337
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 "" )
338
338
endif ()
@@ -346,7 +346,6 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
346
346
endforeach ()
347
347
set (RUNTIMES_${target} _LLVM_LIBC_FULL_BUILD ON CACHE BOOL "" )
348
348
set (RUNTIMES_${target} _LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "" )
349
- set (RUNTIMES_${target} _LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "" )
350
349
set (RUNTIMES_${target} _LIBCXX_ABI_VERSION 2 CACHE STRING "" )
351
350
set (RUNTIMES_${target} _LIBCXX_CXX_ABI none CACHE STRING "" )
352
351
set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
@@ -391,14 +390,13 @@ foreach(target riscv32-unknown-elf)
391
390
foreach (lang C;CXX;ASM)
392
391
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
393
392
# These should be addressed and removed over time.
394
- set (RUNTIMES_${target} _CMAKE_${lang} _FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f -Wno-atomic-alignment \" -Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \" -Dfprintf(stream, format, ...)=printf(format)\" \" -Dtimeval=struct timeval{int tv_sec; int tv_usec;} \" \" - Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1" CACHE STRING "" )
393
+ set (RUNTIMES_${target} _CMAKE_${lang} _FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f -Wno-atomic-alignment \" -Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \" -Dfprintf(stream, format, ...)=printf(format)\" \" -Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1" CACHE STRING "" )
395
394
endforeach ()
396
395
foreach (type SHARED;MODULE;EXE)
397
396
set (RUNTIMES_${target} _CMAKE_${type} _LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "" )
398
397
endforeach ()
399
398
set (RUNTIMES_${target} _LLVM_LIBC_FULL_BUILD ON CACHE BOOL "" )
400
399
set (RUNTIMES_${target} _LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "" )
401
- set (RUNTIMES_${target} _LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "" )
402
400
set (RUNTIMES_${target} _LIBCXX_ABI_VERSION 2 CACHE STRING "" )
403
401
set (RUNTIMES_${target} _LIBCXX_CXX_ABI none CACHE STRING "" )
404
402
set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
0 commit comments