Merge pull request #12698 from hugueskamba/hk-remove-armc5-support-drivers

0xc0170 · web-flow · commit 8376303092bf · 2020-04-03T09:00:49.000+02:00
Drivers: Remove support for ARM Compiler 5
diff --git a/drivers/MbedCRC.h b/drivers/MbedCRC.h
@@ -644,7 +644,7 @@ class MbedCRC {
     }
 
     /* Check to see if we can do assembler optimizations */
-#if ((defined __GNUC__ || defined __clang__) && !defined __CC_ARM) && \
+#if (defined __GNUC__ || defined __clang__) && \
     (defined __arm__ || defined __ARM_ARCH)
 #if (__ARM_ARCH_7M__      == 1U) || \
     (__ARM_ARCH_7EM__     == 1U) || \

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ class MbedCRC {`
`644`	`644`	`}`
`645`	`645`
`646`	`646`	`/* Check to see if we can do assembler optimizations */`
`647`		`-#if ((defined __GNUC__ \|\| defined __clang__) && !defined __CC_ARM) && \`
	`647`	`+#if (defined __GNUC__ \|\| defined __clang__) && \`
`648`	`648`	`(defined __arm__ \|\| defined __ARM_ARCH)`
`649`	`649`	`#if (__ARM_ARCH_7M__ == 1U) \|\| \`
`650`	`650`	`(__ARM_ARCH_7EM__ == 1U) \|\| \`