diff --git a/soc/xtensa/intel_s1000/xcc/CMakeLists.txt b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt index 090721d7500..13ba2bd7930 100644 --- a/soc/xtensa/intel_s1000/xcc/CMakeLists.txt +++ b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt @@ -2,10 +2,3 @@ zephyr_library_sources_ifdef(CONFIG_CPLUSPLUS cpp_fixes.c) zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fixes.c) - -if(NOT (CC STREQUAL "clang")) -# These two are due to IS_ENABLED() not being parsed correctly -# in old GCC 4.2 based XCC. Clang is not affected. -zephyr_library_sources_ifdef(CONFIG_LOG_MINIMAL log_minimal_fixes.c) -zephyr_library_sources_ifdef(CONFIG_TEST ztest_fixes.c) -endif() diff --git a/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c b/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c deleted file mode 100644 index 4073849b675..00000000000 --- a/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2019, Intel Corporation. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -void log_0(const char *str, struct log_msg_ids src_level) -{ -} - -void log_1(const char *str, - log_arg_t arg1, - struct log_msg_ids src_level) -{ -} - -void log_2(const char *str, - log_arg_t arg1, - log_arg_t arg2, - struct log_msg_ids src_level) -{ -} - -void log_3(const char *str, - log_arg_t arg1, - log_arg_t arg2, - log_arg_t arg3, - struct log_msg_ids src_level) -{ -} - -void log_n(const char *str, - log_arg_t *args, - uint32_t narg, - struct log_msg_ids src_level) -{ -} - -void log_hexdump(const char *str, - const uint8_t *data, - uint32_t length, - struct log_msg_ids src_level) -{ -} - -void log_string_sync(struct log_msg_ids src_level, const char *fmt, ...) -{ -} - -void log_hexdump_sync(struct log_msg_ids src_level, const char *metadata, - const uint8_t *data, uint32_t len) -{ -} - -void log_generic(struct log_msg_ids src_level, const char *fmt, va_list ap, - enum log_strdup_action strdup_action) -{ -} - -void log_generic_from_user(struct log_msg_ids src_level, - const char *fmt, va_list ap) -{ -} - -bool log_is_strdup(const void *buf) -{ - return false; -} - -void log_free(void *buf) -{ -} - -uint32_t log_get_strdup_pool_utilization(void) -{ - return 0; -} - -uint32_t log_get_strdup_longest_string(void) -{ - return 0; -} - -void log_dropped(void) -{ -} - -void __printf_like(2, 3) log_from_user(struct log_msg_ids src_level, - const char *fmt, ...) -{ -} - -void log_hexdump_from_user(struct log_msg_ids src_level, const char *metadata, - const uint8_t *data, uint32_t len) -{ -} diff --git a/soc/xtensa/intel_s1000/xcc/ztest_fixes.c b/soc/xtensa/intel_s1000/xcc/ztest_fixes.c deleted file mode 100644 index 82b52a03fda..00000000000 --- a/soc/xtensa/intel_s1000/xcc/ztest_fixes.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2019, Intel Corporation. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -#ifndef CONFIG_ZTEST_RETEST_IF_PASSED - -void sys_reboot(int type) -{ - ARG_UNUSED(type); -} - -#endif /* CONFIG_ZTEST_RETEST_IF_PASSED */