From 2fb464efd9569e5af5dd2d9e4134e7ffb82340aa Mon Sep 17 00:00:00 2001 From: Mauricio Briceno Date: Thu, 9 Jan 2025 17:45:11 +0100 Subject: [PATCH] build: Fix toolchain files - Remove cross-compile 32b support (not working) - clang: use clang system headers Change-Id: If1da8ff9d01e2070ff99fc7f61a2625f75077cbd Signed-off-by: Mauricio Briceno --- ethosu/regor/cmake/toolchains/clang.cmake | 18 +----- ethosu/regor/cmake/toolchains/clang32.cmake | 61 --------------------- ethosu/regor/cmake/toolchains/gcc32.cmake | 55 ------------------- 3 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 ethosu/regor/cmake/toolchains/clang32.cmake delete mode 100644 ethosu/regor/cmake/toolchains/gcc32.cmake diff --git a/ethosu/regor/cmake/toolchains/clang.cmake b/ethosu/regor/cmake/toolchains/clang.cmake index 2221fb61..368cdf4a 100644 --- a/ethosu/regor/cmake/toolchains/clang.cmake +++ b/ethosu/regor/cmake/toolchains/clang.cmake @@ -1,5 +1,5 @@ # -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2023,2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # @@ -33,19 +33,3 @@ set(CMAKE_AR ${_CXX_COMPILER_AR}) find_program(_CXX_COMPILER_RANLIB "${CMAKE_TOOLCHAIN_PREFIX}ranlib" REQUIRED) set(CMAKE_CXX_COMPILER_RANLIB ${_CXX_COMPILER_RANLIB}) set(CMAKE_RANLIB ${_CXX_COMPILER_RANLIB}) - -# Find GCC base path and use it -find_program(_GCC_PATH gcc REQUIRED) -get_filename_component(_GCC_PATH ${_GCC_PATH} DIRECTORY) -add_compile_options(--gcc-toolchain=${_GCC_PATH}/..) -add_link_options(--gcc-toolchain=${_GCC_PATH}/..) - -# Add system headers from GCC -execute_process(COMMAND cpp -xc++ -Wp,-v /dev/null OUTPUT_QUIET ERROR_VARIABLE cpp_out) -string(REPLACE " " ";" cpp_out "${cpp_out}") -string(REPLACE "\n" ";" cpp_out "${cpp_out}") -foreach (e ${cpp_out}) - if (IS_DIRECTORY "${e}") - include_directories(SYSTEM ${e}) - endif() -endforeach() diff --git a/ethosu/regor/cmake/toolchains/clang32.cmake b/ethosu/regor/cmake/toolchains/clang32.cmake deleted file mode 100644 index c262f13d..00000000 --- a/ethosu/regor/cmake/toolchains/clang32.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its affiliates -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed under the Apache License, Version 2.0 (the License); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include_guard(GLOBAL) - -set(CMAKE_CROSSCOMPILING TRUE) -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE) - -set(CMAKE_TOOLCHAIN_PREFIX llvm-) - -find_program(_C_COMPILER "clang" REQUIRED) -set(CMAKE_C_COMPILER ${_C_COMPILER}) - -find_program(_CXX_COMPILER "clang++" REQUIRED) -set(CMAKE_CXX_COMPILER ${_CXX_COMPILER}) - -find_program(_CXX_COMPILER_AR "${CMAKE_TOOLCHAIN_PREFIX}ar" REQUIRED) -set(CMAKE_CXX_COMPILER_AR ${_CXX_COMPILER_AR}) -set(CMAKE_AR ${_CXX_COMPILER_AR}) - -find_program(_CXX_COMPILER_RANLIB "${CMAKE_TOOLCHAIN_PREFIX}ranlib" REQUIRED) -set(CMAKE_CXX_COMPILER_RANLIB ${_CXX_COMPILER_RANLIB}) -set(CMAKE_RANLIB ${_CXX_COMPILER_RANLIB}) - -# Find GCC base path and use it -find_program(_GCC_PATH i686-linux-gnu-gcc) -if (NOT _GCC_PATH) - find_program(_GCC_PATH gcc REQUIRED) -endif() -get_filename_component(_GCC_PATH ${_GCC_PATH} DIRECTORY) -add_compile_options(--gcc-toolchain=${_GCC_PATH}/..) -add_link_options(--gcc-toolchain=${_GCC_PATH}/..) - -# Add system headers from GCC -execute_process(COMMAND cpp -m32 -xc++ -Wp,-v /dev/null OUTPUT_QUIET ERROR_VARIABLE cpp_out) -string(REPLACE " " ";" cpp_out "${cpp_out}") -string(REPLACE "\n" ";" cpp_out "${cpp_out}") -foreach (e ${cpp_out}) - if (IS_DIRECTORY "${e}") - include_directories(SYSTEM ${e}) - endif() -endforeach() - -add_compile_options("-m32" "-march=i686" "-msse" "-msse2" "-mfpmath=sse") -add_link_options("-m32") diff --git a/ethosu/regor/cmake/toolchains/gcc32.cmake b/ethosu/regor/cmake/toolchains/gcc32.cmake deleted file mode 100644 index 19946a3e..00000000 --- a/ethosu/regor/cmake/toolchains/gcc32.cmake +++ /dev/null @@ -1,55 +0,0 @@ -# -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its affiliates -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed under the Apache License, Version 2.0 (the License); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include_guard(GLOBAL) - - -set(CMAKE_CROSSCOMPILING TRUE) -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE) - -# First look for a cross-compilation toolchain -set(CMAKE_TOOLCHAIN_PREFIX i686-linux-gnu-) -set(CMAKE_TOOLCHAIN_SUFFIX "" CACHE STRING "Toolchain suffix e.g. -8 for GCC8") # Can be -9 for GCC9 or -8 for GCC8 etc - -find_program(_C_COMPILER "${CMAKE_TOOLCHAIN_PREFIX}gcc${CMAKE_TOOLCHAIN_SUFFIX}") -if (NOT _C_COMPILER) - # Assume the main toolchain can manage - set(CMAKE_TOOLCHAIN_PREFIX "") -endif() - -# Find compilers -find_program(_C_COMPILER "${CMAKE_TOOLCHAIN_PREFIX}gcc${CMAKE_TOOLCHAIN_SUFFIX}" REQUIRED) -find_program(_CXX_COMPILER "${CMAKE_TOOLCHAIN_PREFIX}g++${CMAKE_TOOLCHAIN_SUFFIX}" REQUIRED) - -# Now set prefix for binutils -set(CMAKE_TOOLCHAIN_PREFIX ${CMAKE_TOOLCHAIN_PREFIX}gcc-) - -set(CMAKE_C_COMPILER ${_C_COMPILER}) -set(CMAKE_CXX_COMPILER ${_CXX_COMPILER}) - -find_program(_CXX_COMPILER_AR "${CMAKE_TOOLCHAIN_PREFIX}ar${CMAKE_TOOLCHAIN_SUFFIX}" REQUIRED) -set(CMAKE_CXX_COMPILER_AR ${_CXX_COMPILER_AR}) -set(CMAKE_AR ${_CXX_COMPILER_AR}) - -find_program(_CXX_COMPILER_RANLIB "${CMAKE_TOOLCHAIN_PREFIX}ranlib${CMAKE_TOOLCHAIN_SUFFIX}" REQUIRED) -set(CMAKE_CXX_COMPILER_RANLIB ${_CXX_COMPILER_RANLIB}) -set(CMAKE_RANLIB ${_CXX_COMPILER_RANLIB}) - -add_compile_options("-m32" "-march=i686" "-msse" "-msse2" "-mfpmath=sse") -add_link_options("-m32") -- GitLab