diff --git a/include/toolchain.h b/include/toolchain.h
index ea905a083b3..88639a83c42 100644
--- a/include/toolchain.h
+++ b/include/toolchain.h
@@ -37,6 +37,8 @@
 #include <toolchain/xcc.h>
 #elif defined(__CCAC__)
 #include <toolchain/mwdt.h>
+#elif defined(__llvm__)
+#include <toolchain/llvm.h>
 #elif defined(__GNUC__) || (defined(_LINKER) && defined(__GCC_LINKER_CMD__))
 #include <toolchain/gcc.h>
 #else
diff --git a/include/toolchain/llvm.h b/include/toolchain/llvm.h
index dc4421aef65..afcac9c279e 100644
--- a/include/toolchain/llvm.h
+++ b/include/toolchain/llvm.h
@@ -7,18 +7,9 @@
 #ifndef ZEPHYR_INCLUDE_TOOLCHAIN_LLVM_H_
 #define ZEPHYR_INCLUDE_TOOLCHAIN_LLVM_H_
 
-#ifndef _LINKER
-#if defined(_ASMLANGUAGE)
-
-#include <toolchain/common.h>
-
-#else /* defined(_ASMLANGUAGE) */
 
 #define __no_optimization __attribute__((optnone))
-
 #include <toolchain/gcc.h>
-#endif /* _ASMLANGUAGE */
 
-#endif /* !_LINKER */
 
 #endif /* ZEPHYR_INCLUDE_TOOLCHAIN_LLVM_H_ */