]> granicus.if.org Git - strace/commitdiff
aarch64: fix compilation warnings
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 5 Mar 2015 04:10:52 +0000 (04:10 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 5 Mar 2015 04:10:52 +0000 (04:10 +0000)
Fix compilation warnings introduced by commit
5b9b7e1d347eb4556084cdccad75e8247c535ed5:

signal.c:702:45: warning: signed and unsigned type in conditional expression [-Wsign-compare]
syscall.c:746:34: warning: initialization from incompatible pointer type [enabled by default]

* syscall.c [AARCH64] (aarch64_sp_ptr): Add explicit cast.
[AARCH64] (arm_sp_ptr): Change pointer type to unsigned.
* linux/aarch64/arch_regs.h (arm_sp_ptr): Update.

Reported-by: Mike Frysinger <vapier@gentoo.org>
linux/aarch64/arch_regs.h
syscall.c

index 290a00ee023670984f3ee7cb8f9052a4ee919e11..9a5e33e0f7c2ddebaa87599deab063833d025cdb 100644 (file)
@@ -1,2 +1,2 @@
 extern uint64_t *const aarch64_sp_ptr;
-extern int *const arm_sp_ptr;
+extern uint32_t *const arm_sp_ptr;
index 59f7d9a6c89b4026b3a26ddb8703528c987e4917..2e536fc995e0d3b4bf25adb59901beccb9a39350 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -743,8 +743,8 @@ static union {
 } arm_regs_union;
 # define aarch64_regs arm_regs_union.aarch64_r
 # define arm_regs     arm_regs_union.arm_r
-uint64_t *const aarch64_sp_ptr = &aarch64_regs.sp;
-int *const arm_sp_ptr = &arm_regs.ARM_sp;
+uint64_t *const aarch64_sp_ptr = (uint64_t *) &aarch64_regs.sp;
+uint32_t *const arm_sp_ptr = (uint32_t *) &arm_regs.ARM_sp;
 static struct iovec aarch64_io = {
        .iov_base = &arm_regs_union
 };