Skip to content

Commit 627b8f8

Browse files
authored
Revert "[Fuchsia][CMake] Enable new libc header gen" (#116174)
Reverts #102371
1 parent 3d3b0bc commit 627b8f8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

clang/cmake/caches/Fuchsia-stage2.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
329329
foreach(lang C;CXX;ASM)
330330
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
331331
# These should be addressed and removed over time.
332-
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")
332+
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")
333333
if(${target} STREQUAL "armv8m.main-none-eabi")
334334
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 "")
335335
endif()
@@ -340,6 +340,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
340340
endforeach()
341341
set(RUNTIMES_${target}_LLVM_LIBC_FULL_BUILD ON CACHE BOOL "")
342342
set(RUNTIMES_${target}_LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "")
343+
set(RUNTIMES_${target}_LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "")
343344
set(RUNTIMES_${target}_LIBCXX_ABI_VERSION 2 CACHE STRING "")
344345
set(RUNTIMES_${target}_LIBCXX_CXX_ABI none CACHE STRING "")
345346
set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
@@ -384,13 +385,14 @@ foreach(target riscv32-unknown-elf)
384385
foreach(lang C;CXX;ASM)
385386
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
386387
# These should be addressed and removed over time.
387-
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 "")
388+
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 "")
388389
endforeach()
389390
foreach(type SHARED;MODULE;EXE)
390391
set(RUNTIMES_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "")
391392
endforeach()
392393
set(RUNTIMES_${target}_LLVM_LIBC_FULL_BUILD ON CACHE BOOL "")
393394
set(RUNTIMES_${target}_LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "")
395+
set(RUNTIMES_${target}_LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "")
394396
set(RUNTIMES_${target}_LIBCXX_ABI_VERSION 2 CACHE STRING "")
395397
set(RUNTIMES_${target}_LIBCXX_CXX_ABI none CACHE STRING "")
396398
set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")

0 commit comments

Comments
 (0)