[Xen-changelog] [xen master] arm64: use "b" to branch to start_xen

[patchbot@xxxxxxx]

commit 0ebbfa4f69cf7bd98ffd50ab35fabf9b36f2deab
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Wed Aug 31 16:26:50 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Wed Aug 31 16:37:23 2016 +0100

    arm64: use "b" to branch to start_xen
    
    The cbz instruction has range limitation. When compiled with gcov
    support the object is larger so cbz can't handle that anymore. The error
    message is like:
    
    aarch64-linux-gnu-ld    -EL  -T xen.lds -N prelink.o \
        /local/work/xen.git/xen/common/symbols-dummy.o -o 
/local/work/xen.git/xen/.xen-syms.0
    prelink.o: In function `launch':
    /local/work/xen.git/xen/arch/arm/arm64/head.S:602:(.text+0x408): relocation 
truncated to fit: R_AARCH64_CONDBR19 against symbol `start_xen' defined in 
.init.text section in prelink.o
    
    Use "b" instead.
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxx>
---
 xen/arch/arm/arm64/head.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 91e2817..3f63d2a 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -599,7 +599,9 @@ launch:
         mov   x0, x20                /* Marshal args: - phys_offset */
         mov   x1, x21                /*               - FDT */
         mov   x2, x24                /*               - CPU ID */
-        cbz   x22, start_xen         /* and disappear into the land of C */
+        cbnz  x22, 1f
+        b     start_xen              /* and disappear into the land of C */
+1:
         b     start_secondary        /* (to the appropriate entry point) */
 
 /* Fail-stop */
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog