From: Vladimir Serbinenko <phcoder@gmail.com>
To: grub-devel@gnu.org
Cc: Vladimir Serbinenko <phcoder@gmail.com>
Subject: [PATCH 3/8] Support clang integrated-as sparc64
Date: Wed, 11 Sep 2024 12:41:20 +0300 [thread overview]
Message-ID: <20240911094125.1813-3-phcoder@gmail.com> (raw)
In-Reply-To: <20240911094125.1813-1-phcoder@gmail.com>
---
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
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
next prev parent reply other threads:[~2024-09-11 9:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 9:41 [PATCH 1/8] riscv64: Support riscv_align relocations Vladimir Serbinenko
2024-09-11 9:41 ` [PATCH 2/8] compiler-rt: Add __multi3 Vladimir Serbinenko
2024-09-11 9:41 ` Vladimir Serbinenko [this message]
2024-09-11 9:41 ` [PATCH 4/8] powerpc-ieee1275: Fix warnings and alignment Vladimir Serbinenko
2024-09-11 9:41 ` [PATCH 5/8] efi/linux: Silence warning Vladimir Serbinenko
2024-09-11 9:41 ` [PATCH 6/8] btrfs: Add an explicit GRUB_PACKED Vladimir Serbinenko
2024-09-11 9:41 ` [PATCH 7/8] Enable __clzsi2/__clzdi2 on arm Vladimir Serbinenko
2024-09-11 9:41 ` [PATCH 8/8] configure: Try -msoft-float -mfloat-abi=soft " Vladimir Serbinenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240911094125.1813-3-phcoder@gmail.com \
--to=phcoder@gmail.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.