[Xen-changelog] [xen master] x86: replace '||' usage in the linker script

[patchbot@xxxxxxx]

commit e21ba44f771226a5f6f0ce269aabcfb019eae539
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Thu Jul 12 10:48:18 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jul 12 10:48:18 2018 +0200

    x86: replace '||' usage in the linker script
    
    With '|'. The result is the same, and the later works with lld. Fixes
    the following error when building Xen with lld:
    
    ld    -melf_x86_64_fbsd  -T xen.lds -N prelink.o --build-id=sha1 \
        /root/src/xen/xen/common/symbols-dummy.o -o 
/root/src/xen/xen/.xen-syms.0
    ld: error: xen.lds:260: malformed number: |
    >>> ASSERT(__image_base__ > (((((((((261 >> 8) * 0xffff000000000000) | (261 
<< 39))) + ((1 << 39) / 2)) + (64 << 30)) + (1 << 30)) + (1 << 30))) ||
    >>>                                                                         
                                                                      ^
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/xen.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index 70afedd31d..326e885402 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -331,7 +331,7 @@ SECTIONS
   .comment 0 : { *(.comment) }
 }
 
-ASSERT(__image_base__ > XEN_VIRT_START ||
+ASSERT(__image_base__ > XEN_VIRT_START |
        __2M_rwdata_end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE,
        "Xen image overlaps stubs area")
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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