diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
commit | 6b6ede3d15f04fe825cfa9f697507457e3640344 (patch) | |
tree | efe9bf75eaf2200f89087ed0ef2ef350549ccd6d /libpthread/linuxthreads/sysdeps/ia64/pt-machine.h | |
parent | f972c2262fd4efc2bbf9789dce145bb705acec24 (diff) |
resolve merge
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/ia64/pt-machine.h')
-rw-r--r-- | libpthread/linuxthreads/sysdeps/ia64/pt-machine.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h index 55bdd5df5..f4c6be989 100644 --- a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h @@ -23,6 +23,10 @@ #include <features.h> #include <ia64intrin.h> +#include <sys/types.h> +extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, + size_t __child_stack_size, int __flags, void *__arg, ...); + #ifndef PT_EI # define PT_EI __extern_always_inline #endif @@ -30,7 +34,7 @@ /* Make sure gcc doesn't try to be clever and move things around on us. We need to use _exactly_ the address the user gave us, not some alias that contains the same information. */ -#define __atomic_fool_gcc(x) (*(__volatile__ struct { int a[100]; } *)x) +#define __atomic_fool_gcc(x) (*(volatile struct { int a[100]; } *)x) #ifndef ELF_MACHINE_NAME |