[PATCH 3/8] Support clang integrated-as sparc64

[Vladimir Serbinenko]

---
 asm-tests/sparc64.S                        | 2 +-
 grub-core/boot/sparc64/ieee1275/boot.S     | 3 +++
 grub-core/boot/sparc64/ieee1275/diskboot.S | 3 +++
 grub-core/kern/sparc64/ieee1275/crt0.S     | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/asm-tests/sparc64.S b/asm-tests/sparc64.S
index 03c5fe02a..56bd9cda8 100644
--- a/asm-tests/sparc64.S
+++ b/asm-tests/sparc64.S
@@ -3,7 +3,7 @@
        /* A small list of examples of what clang doesn't support.  */
        clr     %o0
        lduw    [%o4 + 4], %o4
-       and     %o6, ~0xff, %o6
+       and     %o6, 0xffffffffffffff00, %o6
        stw     %o5, [%o3]
        bne,pt  %icc, 1b
         nop
diff --git a/grub-core/boot/sparc64/ieee1275/boot.S 
b/grub-core/boot/sparc64/ieee1275/boot.S
index ff8a79d3b..9a67bc609 100644
--- a/grub-core/boot/sparc64/ieee1275/boot.S
+++ b/grub-core/boot/sparc64/ieee1275/boot.S
@@ -93,7 +93,10 @@ prom_exit_name:              .asciz "exit"
 grub_name:             .asciz "GRUB "
 #ifdef CDBOOT
 prom_close_name:       .asciz "close"
+                       .byte 0
+                       .byte 0
 #endif
+                       .byte 0
 
 #define GRUB_NAME_LEN  5
 
diff --git a/grub-core/boot/sparc64/ieee1275/diskboot.S 
b/grub-core/boot/sparc64/ieee1275/diskboot.S
index 35e02c1b6..0c8deb11f 100644
--- a/grub-core/boot/sparc64/ieee1275/diskboot.S
+++ b/grub-core/boot/sparc64/ieee1275/diskboot.S
@@ -43,6 +43,9 @@ notification_step:            .asciz "."
 notification_done:             .asciz "\r\n"
 #define NOTIFICATION_DONE_LEN  2
 
+       .byte 0
+       .byte 0
+
        .align  4
 
        /* %o2: message string
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S 
b/grub-core/kern/sparc64/ieee1275/crt0.S
index 03b916f05..92bac2142 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -56,7 +56,7 @@ codestart:
        sethi   %hi(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
        or      %o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
        add     %o3, %o5, %o6
-       and     %o6, ~0xff, %o6
+       and     %o6, 0xffffffffffffff00, %o6
        sub     %o6, 2047, %o6
        
        sub     %o2, 4, %o2
-- 
2.39.2