From ac4ebe4ffb531cc3f09d974bc1284cb3c37b4871 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 16 Dec 2019 09:35:03 -0800 Subject: [PATCH] soc: intel_s1000: move XCC fixes into its own directory Turns out it's going to have more fixes than just Newlib. So put them into one directory. Signed-off-by: Daniel Leung --- soc/xtensa/intel_s1000/CMakeLists.txt | 4 +--- soc/xtensa/intel_s1000/xcc/CMakeLists.txt | 3 +++ .../intel_s1000/{xcc_newlib_fix.c => xcc/newlib_fixes.c} | 0 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 soc/xtensa/intel_s1000/xcc/CMakeLists.txt rename soc/xtensa/intel_s1000/{xcc_newlib_fix.c => xcc/newlib_fixes.c} (100%) diff --git a/soc/xtensa/intel_s1000/CMakeLists.txt b/soc/xtensa/intel_s1000/CMakeLists.txt index 6d64c0e7b56..ae8aa2050e4 100644 --- a/soc/xtensa/intel_s1000/CMakeLists.txt +++ b/soc/xtensa/intel_s1000/CMakeLists.txt @@ -5,7 +5,5 @@ zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) zephyr_library_sources(soc.c) if("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc") -if(CONFIG_NEWLIB_LIBC) - zephyr_library_sources(xcc_newlib_fix.c) -endif() +add_subdirectory(xcc) endif() diff --git a/soc/xtensa/intel_s1000/xcc/CMakeLists.txt b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt new file mode 100644 index 00000000000..7525c28a8f0 --- /dev/null +++ b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fixes.c) diff --git a/soc/xtensa/intel_s1000/xcc_newlib_fix.c b/soc/xtensa/intel_s1000/xcc/newlib_fixes.c similarity index 100% rename from soc/xtensa/intel_s1000/xcc_newlib_fix.c rename to soc/xtensa/intel_s1000/xcc/newlib_fixes.c