| Macros '__ARM_FEATURE_DSP' and '__ARM_FEATURE_UNALIGNED' may already be |
| defined by gcc(1) on '-march=armv7-{a|r}'. |
| |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/arm/include/acle-compat.h freebsd-11.1/sys/arm/include/acle-compat.h |
| --- /usr/src/sys/arm/include/acle-compat.h 2017-07-21 07:42:04.000000000 +0800 |
| +++ freebsd-11.1/sys/arm/include/acle-compat.h 2019-12-20 16:58:56.437450829 +0800 |
| @@ -56,11 +56,15 @@ |
| # define __ARM_ARCH_ISA_ARM |
| # define __ARM_FEATURE_CLZ |
| # define __ARM_FEATURE_SIMD32 |
| -# define __ARM_FEATURE_DSP |
| +# ifndef __ARM_FEATURE_DSP |
| +# define __ARM_FEATURE_DSP |
| +# endif |
| # define __ARM_FEATURE_QBIT |
| # define __ARM_FEATURE_SAT |
| # define __ARM_FEATURE_LDREX 15 |
| -# define __ARM_FEATURE_UNALIGNED |
| +# ifndef __ARM_FEATURE_UNALIGNED |
| +# define __ARM_FEATURE_UNALIGNED |
| +# endif |
| # ifdef __ARM_ARCH_7A__ |
| # define __ARM_ARCH_PROFILE 'A' |
| # else |