- fix the compiling errors on MAC 0983cffc501e5279e7d9e9b2241b506cb332efcb - fix clang compile errors on linux 577b658105b90ec1c04b049e43a51384172fb8fc Index: source/common/aarch64/asm.S --- source/common/aarch64/asm.S.orig +++ source/common/aarch64/asm.S @@ -25,23 +25,35 @@ #ifdef PREFIX #define EXTERN_ASM _ +#define HAVE_AS_FUNC 0 +#elif defined __clang__ +#define EXTERN_ASM +#define HAVE_AS_FUNC 0 +#define PREFIX 1 #else #define EXTERN_ASM +#define HAVE_AS_FUNC 1 #endif #ifdef __ELF__ #define ELF #else +#ifdef PREFIX +#define ELF # +#else #define ELF @ #endif +#endif -#define HAVE_AS_FUNC 1 - #if HAVE_AS_FUNC #define FUNC #else +#ifdef PREFIX +#define FUNC # +#else #define FUNC @ #endif +#endif .macro function name, export=1 .macro endfunc @@ -56,6 +68,7 @@ ELF .hidden EXTERN_ASM\name ELF .type EXTERN_ASM\name, %function FUNC .func EXTERN_ASM\name EXTERN_ASM\name: + bti c .else ELF .hidden \name ELF .type \name, %function