Module Name: src
Committed By: christos
Date: Tue Jul 17 00:37:42 UTC 2018
Modified Files:
src/sys/arch/evbarm/fdt: fdt_start.S
Log Message:
XXX: make this assemble with gas, but I should remove the ifdefs...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/fdt/fdt_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/fdt/fdt_start.S
diff -u src/sys/arch/evbarm/fdt/fdt_start.S:1.1 src/sys/arch/evbarm/fdt/fdt_start.S:1.2
--- src/sys/arch/evbarm/fdt/fdt_start.S:1.1 Sun Apr 1 00:35:04 2018
+++ src/sys/arch/evbarm/fdt/fdt_start.S Mon Jul 16 20:37:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_start.S,v 1.1 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: fdt_start.S,v 1.2 2018/07/17 00:37:42 christos Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -32,7 +32,7 @@
#include <aarch64/asm.h>
-RCSID("$NetBSD: fdt_start.S,v 1.1 2018/04/01 04:35:04 ryo Exp $")
+RCSID("$NetBSD: fdt_start.S,v 1.2 2018/07/17 00:37:42 christos Exp $")
#define PRINT(string) \
bl xprint;.asciz string;.align 2
@@ -47,7 +47,13 @@ start:
sub x10, x10, x9
+#ifdef __clang__
ldr x8, =(kern_vtopdiff - start)
+#else
+ ldr x7, =start
+ ldr x8, =kern_vtopdiff
+ sub x8, x8, x7
+#endif
add x8, x8, x9
str x10, [x8]
@@ -56,7 +62,12 @@ start:
*/
/* offset of uboot_args from start */
+#ifdef __clang__
ldr x8, =(uboot_args - start)
+#else
+ ldr x8, =uboot_args
+ sub x8, x8, x7
+#endif
add x8, x8, x9 /* add load address to offset */
str x0, [x8, #(8*0)]
@@ -67,7 +78,12 @@ start:
/*
* ARM64 boot protocol has FDT address in x0 *
*/
+#ifdef __clang__
ldr x8, =(fdt_addr_r - start)
+#else
+ ldr x8, =fdt_addr_r
+ sub x8, x8, x7
+#endif
add x8, x8, x9
str x0, [x8]
