diff --git a/soc/xtensa/intel_s1000/xcc/CMakeLists.txt b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt
index 7525c28a8f0..13ba2bd7930 100644
--- a/soc/xtensa/intel_s1000/xcc/CMakeLists.txt
+++ b/soc/xtensa/intel_s1000/xcc/CMakeLists.txt
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
+zephyr_library_sources_ifdef(CONFIG_CPLUSPLUS cpp_fixes.c)
 zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fixes.c)
diff --git a/soc/xtensa/intel_s1000/xcc/cpp_fixes.c b/soc/xtensa/intel_s1000/xcc/cpp_fixes.c
new file mode 100644
index 00000000000..2e840c7d3e4
--- /dev/null
+++ b/soc/xtensa/intel_s1000/xcc/cpp_fixes.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2019, Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+
+#ifdef __clang__
+
+int atexit(void (*function)(void))
+{
+	return 0;
+}
+
+#endif /* __clang__ */