From 0cddc48c55ee70d14e613333a9126b23dfc7b8d7 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 31 Jan 2022 21:14:43 +0100 Subject: [PATCH] [AOT] Use `.short` directive instead of `.hword` Xamarin.Android is trying to (partially) switch to LLVM-based toolchain and it appears that the `llvm-mc` assembler doesn't accept `.hword` as a valid directive for x86 targets. Since it's an alias for `.short`, which works fine, the change should be safe across all the architectures supported by AOT. --- src/mono/mono/mini/image-writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono/mini/image-writer.c b/src/mono/mono/mini/image-writer.c index cc81ac7b070dc..db6fd89acad0b 100644 --- a/src/mono/mono/mini/image-writer.c +++ b/src/mono/mono/mini/image-writer.c @@ -77,7 +77,7 @@ #elif defined(TARGET_ASM_GAS) && defined(TARGET_WIN32) #define AS_INT16_DIRECTIVE ".word" #elif defined(TARGET_ASM_GAS) -#define AS_INT16_DIRECTIVE ".hword" +#define AS_INT16_DIRECTIVE ".short" #else #define AS_INT16_DIRECTIVE ".word" #endif