Skip to content

Commit 4a3a8ca

Browse files
committed
Set ARCH_TRIPLE from cache files and not yml file.
1 parent 54bf553 commit 4a3a8ca

File tree

7 files changed

+6
-1
lines changed

7 files changed

+6
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ jobs:
151151
152152
case "${{ matrix.target }}" in
153153
*-none-eabi|riscv32-unknown-elf)
154-
cmake -DARCH_TRIPLE="${{ matrix.target }}" \
155154
$CMAKE_FLAGS \
156155
-C ${{ github.workspace }}/libc/cmake/caches/${{ matrix.target }}.cmake
157156
;;

libc/cmake/caches/armv6m-none-eabi.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
set(ARCH_TRIPLE "armv6m-none-eabi" CACHE STRING "")
23

34
foreach(lang C;CXX;ASM)
45
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 "")

libc/cmake/caches/armv7em-none-eabi.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
set(ARCH_TRIPLE "armv7em-none-eabi" CACHE STRING "")
23

34
foreach(lang C;CXX;ASM)
45
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 "")

libc/cmake/caches/armv7m-none-eabi.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
set(ARCH_TRIPLE "armv7m-none-eabi" CACHE STRING "")
23

34
foreach(lang C;CXX;ASM)
45
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 "")

libc/cmake/caches/armv8.1m.main-none-eabi.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
set(ARCH_TRIPLE "armv8.1m.main-none-eabi" CACHE STRING "")
23

34
foreach(lang C;CXX;ASM)
45
set(CMAKE_${lang}_FLAGS "-mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "")

libc/cmake/caches/armv8m.main-none-eabi.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
2+
set(ARCH_TRIPLE "armv8m.main-none-eabi" CACHE STRING "")
23

34
foreach(lang C;CXX;ASM)
45
set(CMAKE_${lang}_FLAGS "-mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
set(CMAKE_SYSTEM_PROCESSOR RISCV CACHE STRING "")
2+
set(ARCH_TRIPLE "riscv32-unknown-elf" CACHE STRING "")
23

34
include(${CMAKE_CURRENT_LIST_DIR}/baremetal_common.cmake)

0 commit comments

Comments
 (0)