From 476c11c7be9e5914e99e51e06ac5865fce2b970f Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Wed, 11 Jul 2018 08:01:27 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12158
 110e8d01-0319-4d1e-a829-52ad28d1bb01

---
 os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk | 2 +-
 os/rt/include/ch.h                                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'os')

diff --git a/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk b/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk
index 6959e59e3..38e9f1979 100644
--- a/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk
+++ b/os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk
@@ -10,7 +10,7 @@ CPPC = clang++
 #       runtime support makes code size explode.
 LD   = clang
 CP   = $(TRGT)objcopy
-AS   = clang -x assembler-with-cpp
+AS   = $(TRGT)as -x assembler-with-cpp
 AR   = $(TRGT)ar
 OD   = $(TRGT)objdump
 SZ   = $(TRGT)size
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h
index cf9ca01b6..97bd01614 100644
--- a/os/rt/include/ch.h
+++ b/os/rt/include/ch.h
@@ -53,7 +53,7 @@
 /**
  * @brief   Kernel version major number.
  */
-#define CH_KERNEL_MAJOR         5
+#define CH_KERNEL_MAJOR         6
 
 /**
  * @brief   Kernel version minor number.
@@ -74,7 +74,7 @@
  * @note    It is meant to be used in configuration files as switch.
  */
 #if !defined(FALSE) || defined(__DOXYGEN__)
-#define FALSE               0
+#define FALSE                   0
 #endif
 
 /**
@@ -82,7 +82,7 @@
  * @note    It is meant to be used in configuration files as switch.
  */
 #if !defined(TRUE) || defined(__DOXYGEN__)
-#define TRUE                1
+#define TRUE                    1
 #endif
 /** @} */
 
-- 
cgit v1.2.3