https://github.com/petrhosek updated
https://github.com/llvm/llvm-project/pull/102371
>From 6dbb8be2352d0cdad44d293f7cc5c13f55ec243d Mon Sep 17 00:00:00 2001
From: Petr Hosek <pho...@google.com>
Date: Wed, 7 Aug 2024 07:40:09 +0000
Subject: [PATCH 1/2] [Fuchsia][CMake] Enable new libc header gen
All issues blocking this were resolved.
---
clang/cmake/caches/Fuchsia-stage2.cmake | 2 --
1 file changed, 2 deletions(-)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake
b/clang/cmake/caches/Fuchsia-stage2.cmake
index fb9ebeeb0031ff..f1b3414d18d44b 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -338,7 +338,6 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
endforeach()
set(RUNTIMES_${target}_LLVM_LIBC_FULL_BUILD ON CACHE BOOL "")
set(RUNTIMES_${target}_LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "")
- set(RUNTIMES_${target}_LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "")
set(RUNTIMES_${target}_LIBCXX_ABI_VERSION 2 CACHE STRING "")
set(RUNTIMES_${target}_LIBCXX_CXX_ABI none CACHE STRING "")
set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
@@ -390,7 +389,6 @@ foreach(target riscv32-unknown-elf)
endforeach()
set(RUNTIMES_${target}_LLVM_LIBC_FULL_BUILD ON CACHE BOOL "")
set(RUNTIMES_${target}_LIBC_ENABLE_USE_BY_CLANG ON CACHE BOOL "")
- set(RUNTIMES_${target}_LIBC_USE_NEW_HEADER_GEN OFF CACHE BOOL "")
set(RUNTIMES_${target}_LIBCXX_ABI_VERSION 2 CACHE STRING "")
set(RUNTIMES_${target}_LIBCXX_CXX_ABI none CACHE STRING "")
set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
>From ed4a9ff2628ce3d266760715b0bfc2fcd22eb085 Mon Sep 17 00:00:00 2001
From: Petr Hosek <pho...@google.com>
Date: Wed, 13 Nov 2024 03:23:02 +0000
Subject: [PATCH 2/2] Remove the `timeval` define
---
clang/cmake/caches/Fuchsia-stage2.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake
b/clang/cmake/caches/Fuchsia-stage2.cmake
index f938ea6a3edf48..d5859c8806b561 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -329,7 +329,7 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
foreach(lang C;CXX;ASM)
# TODO: The preprocessor defines workaround various issues in libc and
libc++ integration.
# These should be addressed and removed over time.
- 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")
+ 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")
if(${target} STREQUAL "armv8m.main-none-eabi")
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 "")
endif()
@@ -384,7 +384,7 @@ foreach(target riscv32-unknown-elf)
foreach(lang C;CXX;ASM)
# TODO: The preprocessor defines workaround various issues in libc and
libc++ integration.
# These should be addressed and removed over time.
- 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 "")
+ 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 "")
endforeach()
foreach(type SHARED;MODULE;EXE)
set(RUNTIMES_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE
STRING "")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
