Skip to content

Commit 54bf553

Browse files
committed
Break out architecture specific flags into dedicated cache files.
1 parent 9a6a569 commit 54bf553

9 files changed

+56
-55
lines changed

.github/workflows/libc-fullbuild-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
*-none-eabi|riscv32-unknown-elf)
154154
cmake -DARCH_TRIPLE="${{ matrix.target }}" \
155155
$CMAKE_FLAGS \
156-
-C ${{ github.workspace }}/libc/cmake/caches/Standalone_libc_baremetal.cmake
156+
-C ${{ github.workspace }}/libc/cmake/caches/${{ matrix.target }}.cmake
157157
;;
158158
*)
159159
cmake -DLLVM_RUNTIME_TARGETS=${{ matrix.target }} \

libc/cmake/caches/Standalone_libc_baremetal.cmake

Lines changed: 0 additions & 54 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
3+
foreach(lang C;CXX;ASM)
4+
set(CMAKE_${lang}_FLAGS "-march=armv6m -mcpu=cortex-m0plus -mfloat-abi=soft -Wno-atomic-alignment \"-Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \"-Dfprintf(stream, format, ...)=printf(format)\" \"-Dfputs(string, stream)=puts(string)\" -D_LIBCPP_PRINT=1" CACHE STRING "")
5+
endforeach()
6+
7+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
3+
foreach(lang C;CXX;ASM)
4+
set(CMAKE_${lang}_FLAGS "-march=armv7em -mcpu=cortex-m4 -mfloat-abi=soft -Wno-atomic-alignment \"-Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \"-Dfprintf(stream, format, ...)=printf(format)\" \"-Dfputs(string, stream)=puts(string)\" -D_LIBCPP_PRINT=1" CACHE STRING "")
5+
endforeach()
6+
7+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
3+
foreach(lang C;CXX;ASM)
4+
set(CMAKE_${lang}_FLAGS "-march=armv7m -mcpu=cortex-m4 -mfloat-abi=soft -Wno-atomic-alignment \"-Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \"-Dfprintf(stream, format, ...)=printf(format)\" \"-Dfputs(string, stream)=puts(string)\" -D_LIBCPP_PRINT=1" CACHE STRING "")
5+
endforeach()
6+
7+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
3+
foreach(lang C;CXX;ASM)
4+
set(CMAKE_${lang}_FLAGS "-mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "")
5+
endforeach()
6+
7+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
3+
foreach(lang C;CXX;ASM)
4+
set(CMAKE_${lang}_FLAGS "-mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
5+
endforeach()
6+
7+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Expects target triple to be passed as `ARCH_TRIPLE`
2+
3+
set(CMAKE_SYSTEM_NAME Generic CACHE STRING "")
4+
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "")
5+
set(LLVM_ENABLE_RUNTIMES "libc" CACHE STRING "")
6+
set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
7+
set(CMAKE_C_COMPILER_WORKS ON CACHE BOOL "")
8+
set(CMAKE_CXX_COMPILER_WORKS ON CACHE BOOL "")
9+
set(CMAKE_SYSROOT "" CACHE STRING "")
10+
11+
set(CMAKE_C_COMPILER_TARGET ${ARCH_TRIPLE} CACHE STRING "")
12+
set(CMAKE_CXX_COMPILER_TARGET ${ARCH_TRIPLE} CACHE STRING "")
13+
set(CMAKE_ASM_COMPILER_TARGET ${ARCH_TRIPLE} CACHE STRING "")
14+
set(LLVM_DEFAULT_TARGET_TRIPLE ${ARCH_TRIPLE} CACHE STRING "")
15+
set(LIBC_TARGET_TRIPLE ${ARCH_TRIPLE} CACHE STRING "")
16+
17+
set(LLVM_LIBC_FULL_BUILD "ON" CACHE BOOL "")
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set(CMAKE_SYSTEM_PROCESSOR RISCV CACHE STRING "")
2+
3+
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)

0 commit comments

Comments
 (0)