| Message ID | alpine.DEB.2.21.1908070942410.2451@sstabellini-ThinkPad-T480s (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] xen/arm: unbreak arm64 build for older toolchains | expand |
Hi Stefano, On 07/08/2019 17:49, Stefano Stabellini wrote: > Commit 4941bfb "xen/arm64: macros: Introduce an assembly macro to alias > x30" moved > > lr .req x30 > > to macros.h. A later patch (1396dab "xen/arm64: head: Don't clobber > x30/lr in the macro PRINT") started to use "lr" in head.S, however, it > didn't add an #include macros.h to head.S. This commit fixes it. > > The lack of alias breaks the build with > gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu. The alias was added > later to binutiles 2.29 in 2017. NIT: binutiles/binutils/ > > Signed-off-by: Stefano Stabellini <stefanos@xilinx.com> Reviewed-by: Julien Grall <julien.grall@arm.com> Cheers,
diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 28efe9230c..50cff08756 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -25,6 +25,7 @@ #include <asm/early_printk.h> #include <efi/efierr.h> #include <asm/arm64/efibind.h> +#include <asm/arm64/macros.h> #define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ #define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */
Commit 4941bfb "xen/arm64: macros: Introduce an assembly macro to alias x30" moved lr .req x30 to macros.h. A later patch (1396dab "xen/arm64: head: Don't clobber x30/lr in the macro PRINT") started to use "lr" in head.S, however, it didn't add an #include macros.h to head.S. This commit fixes it. The lack of alias breaks the build with gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu. The alias was added later to binutiles 2.29 in 2017. Signed-off-by: Stefano Stabellini <stefanos@xilinx.com> --- Changes in v2: - improve commit message