gwj / at91sam9263 · Commits

Commit 9dfa5b421dcb7f213163d2bd80549d6ca4bc74a6

Authored by bellard
1 parent 9da8ba18

64 bit fixes (Falk Hueffner) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@365 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
linux-user/signal.c
  View file @9dfa5b4
@@ -152,7 +152,7 @@ void target_to_host_sigset(sigset_t *d, const target_sigset_t *s) @@ -152,7 +152,7 @@ void target_to_host_sigset(sigset_t *d, const target_sigset_t *s)
152 ((unsigned long *)d)[i] = tswapl(s->sig[i]); 152 ((unsigned long *)d)[i] = tswapl(s->sig[i]);
153 } 153 }
154 #elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2 154 #elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2
155 - ((unsigned long *)d)[0] = sigmask | (tswapl(s->sig[1]) << 32); 155 + ((unsigned long *)d)[0] = sigmask | ((unsigned long)tswapl(s->sig[1]) << 32);
156 #else 156 #else
157 #error target_to_host_sigset 157 #error target_to_host_sigset
158 #endif /* TARGET_LONG_BITS */ 158 #endif /* TARGET_LONG_BITS */
@@ -60,7 +60,7 @@ int bdrv_commit(BlockDriverState *bs); @@ -60,7 +60,7 @@ int bdrv_commit(BlockDriverState *bs);
60 60
61 struct cow_header_v2 { 61 struct cow_header_v2 {
62 uint32_t magic; 62 uint32_t magic;
63 - uint32_t long version; 63 + uint32_t version;
64 char backing_file[1024]; 64 char backing_file[1024];
65 int32_t mtime; 65 int32_t mtime;
66 uint64_t size; 66 uint64_t size;