@@ -332,7 +332,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
332332 foreach (lang C;CXX;ASM)
333333 # TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
334334 # 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" )
336336 if (${target} STREQUAL "armv8m.main-none-eabi" )
337337 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 "" )
338338 endif ()
@@ -346,7 +346,6 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
346346 endforeach ()
347347 set (RUNTIMES_${target} _LLVM_LIBC_FULL_BUILD ON CACHE BOOL "" )
348348 set (RUNTIMES_${target} _LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "" )
349- set (RUNTIMES_${target} _LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "" )
350349 set (RUNTIMES_${target} _LIBCXX_ABI_VERSION 2 CACHE STRING "" )
351350 set (RUNTIMES_${target} _LIBCXX_CXX_ABI none CACHE STRING "" )
352351 set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
@@ -391,14 +390,13 @@ foreach(target riscv32-unknown-elf)
391390 foreach (lang C;CXX;ASM)
392391 # TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
393392 # 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 "" )
395394 endforeach ()
396395 foreach (type SHARED;MODULE;EXE)
397396 set (RUNTIMES_${target} _CMAKE_${type} _LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "" )
398397 endforeach ()
399398 set (RUNTIMES_${target} _LLVM_LIBC_FULL_BUILD ON CACHE BOOL "" )
400399 set (RUNTIMES_${target} _LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "" )
401- set (RUNTIMES_${target} _LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "" )
402400 set (RUNTIMES_${target} _LIBCXX_ABI_VERSION 2 CACHE STRING "" )
403401 set (RUNTIMES_${target} _LIBCXX_CXX_ABI none CACHE STRING "" )
404402 set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
0 commit comments