diff options
| author | tschwinge <tschwinge> | 2008-06-18 11:42:19 +0000 |
|---|---|---|
| committer | tschwinge <tschwinge> | 2008-06-18 11:42:19 +0000 |
| commit | bace06aa8d0c1374cbf3db89a2f798997c445511 (patch) | |
| tree | a07acb7e219f8be12fa2a2979ee39f95d9bf7c01 /libl4 | |
| parent | be47270d9c9308c2f0c8d8ca2e6a9694951695a2 (diff) | |
2008-06-18 Thomas Schwinge <tschwinge@gnu.org>
* ia32/l4/bits/syscall.h (_L4_kernel_interface): Cast return value.
* ia32/l4/bits/vregs.h (_L4_utcb_base): Don't do calculations with a
void *. Cast return value.
* l4/gnu/thread.h (l4_set_user_defined_handle): Change name of argument
as to avoid using a C++ keyword.
Diffstat (limited to 'libl4')
| -rw-r--r-- | libl4/ChangeLog | 8 | ||||
| -rw-r--r-- | libl4/ia32/l4/bits/syscall.h | 2 | ||||
| -rw-r--r-- | libl4/ia32/l4/bits/vregs.h | 4 | ||||
| -rw-r--r-- | libl4/l4/gnu/thread.h | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/libl4/ChangeLog b/libl4/ChangeLog index 86deaeb..f18ffdc 100644 --- a/libl4/ChangeLog +++ b/libl4/ChangeLog @@ -1,3 +1,11 @@ +2008-06-18 Thomas Schwinge <tschwinge@gnu.org> + + * ia32/l4/bits/syscall.h (_L4_kernel_interface): Cast return value. + * ia32/l4/bits/vregs.h (_L4_utcb_base): Don't do calculations with a + void *. Cast return value. + * l4/gnu/thread.h (l4_set_user_defined_handle): Change name of argument + as to avoid using a C++ keyword. + 2008-05-29 Thomas Schwinge <tschwinge@gnu.org> * headers.m4: Link files into `sysroot/include/' instead of `include/'. diff --git a/libl4/ia32/l4/bits/syscall.h b/libl4/ia32/l4/bits/syscall.h index e485746..769f146 100644 --- a/libl4/ia32/l4/bits/syscall.h +++ b/libl4/ia32/l4/bits/syscall.h @@ -42,7 +42,7 @@ _L4_kernel_interface (_L4_api_version_t *api_version, : "=a" (kip), "=c" (*api_version), "=d" (*api_flags), "=S" (*kernel_id)); - return kip; + return (_L4_kip_t) kip; #else _L4_TEST_KERNEL_INTERFACE_IMPL #endif /* _L4_TEST_ENVIRONMENT */ diff --git a/libl4/ia32/l4/bits/vregs.h b/libl4/ia32/l4/bits/vregs.h index b5807ee..9ca1708 100644 --- a/libl4/ia32/l4/bits/vregs.h +++ b/libl4/ia32/l4/bits/vregs.h @@ -32,7 +32,7 @@ _L4_utcb (void) #ifndef _L4_TEST_ENVIRONMENT _L4_word_t *utcb; - __asm__ __volatile__ ("movl %%gs:4, %[utcb]" + __asm__ __volatile__ ("movl %%gs:0, %[utcb]" : [utcb] "=r" (utcb)); return utcb; @@ -63,7 +63,7 @@ _L4_attribute_always_inline _L4_utcb_base (void) { /* 256 is a magic number, which unfortunately is not exported. */ - return ((void *) _L4_utcb () - 256); + return (_L4_word_t *) ((char *) _L4_utcb () - 256); } /* Get the local thread ID. */ diff --git a/libl4/l4/gnu/thread.h b/libl4/l4/gnu/thread.h index cac4330..4f1e451 100644 --- a/libl4/l4/gnu/thread.h +++ b/libl4/l4/gnu/thread.h @@ -202,9 +202,9 @@ l4_user_defined_handle (void) static inline void _L4_attribute_always_inline -l4_set_user_defined_handle (l4_word_t new) +l4_set_user_defined_handle (l4_word_t handle) { - _L4_set_user_defined_handle (new); + _L4_set_user_defined_handle (handle); } |