diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-07-11 08:01:27 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-07-11 08:01:27 +0000 |
| commit | 476c11c7be9e5914e99e51e06ac5865fce2b970f (patch) | |
| tree | 22e679f398393ec91d5662fdcd5339a5098dd479 | |
| parent | 6b149e60a14cdfff2aa0c502a4e73c62f53a8496 (diff) | |
| download | ChibiOS-476c11c7be9e5914e99e51e06ac5865fce2b970f.tar.gz ChibiOS-476c11c7be9e5914e99e51e06ac5865fce2b970f.tar.bz2 ChibiOS-476c11c7be9e5914e99e51e06ac5865fce2b970f.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12158 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/LLVM/mk/clang.mk | 2 | ||||
| -rw-r--r-- | os/rt/include/ch.h | 6 |
2 files changed, 4 insertions, 4 deletions
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
/** @} */
|