Fix some compiler warnings.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3520 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index d0f650edaab23e7bb1e5dffaf8870d7ec1a5e484..6fc0bbffcb60d9ebf2619c0ba3ff38c4629338d2 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -9,10 +9,16 @@
 #ifdef TARGET_ABI32
 typedef uint32_t abi_ulong;
 typedef int32_t abi_long;
+#define TARGET_ABI_FMT_lx "%08x"
+#define TARGET_ABI_FMT_ld "%d"
+#define TARGET_ABI_FMT_lu "%u"
 #define TARGET_ABI_BITS 32
 #else
 typedef target_ulong abi_ulong;
 typedef target_long abi_long;
+#define TARGET_ABI_FMT_lx TARGET_FMT_lx
+#define TARGET_ABI_FMT_ld TARGET_FMT_ld
+#define TARGET_ABI_FMT_lu TARGET_FMT_lu
 #define TARGET_ABI_BITS TARGET_LONG_BITS
 #endif
 

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 14323e7d4b764471ba24be195961fdb972513afe..c645ddfca086469fa120bbe86ecd3dd96b836873 100644 (file)
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -106,7 +106,8 @@ print_timeval(target_ulong tv_addr)
             return;
 
        tv = lock_user(tv_addr, sizeof(*tv), 1);
-        gemu_log("{%d,%d}", tv->tv_sec, tv->tv_usec);
+        gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}",
+                tv->tv_sec, tv->tv_usec);
         unlock_user(tv, tv_addr, 0);
     } else
         gemu_log("NULL");
@@ -220,12 +221,15 @@ if( ret == -1 ) {
     }
 }
 
+#if 0 /* currently unused */
 static void
 print_syscall_ret_raw(struct syscallname *name, target_long ret)
 {
         gemu_log(" = " TARGET_FMT_lx "\n", ret);
 }
+#endif
 
+#ifdef TARGET_NR__newselect
 static void
 print_syscall_ret_newselect(struct syscallname *name, target_long ret)
 {
@@ -239,6 +243,7 @@ print_syscall_ret_newselect(struct syscallname *name, target_long ret)
     print_timeval(newselect_arg5);
     gemu_log(")\n");
 }
+#endif
 
 /*
  * An array of all of the syscalls we know about