From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- libpthread/linuxthreads/sysdeps/ia64/pt-machine.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libpthread/linuxthreads/sysdeps/ia64/pt-machine.h') diff --git a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h index f4c6be989..55bdd5df5 100644 --- a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h @@ -23,10 +23,6 @@ #include #include -#include -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 @@ -34,7 +30,7 @@ extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, /* 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 -- cgit v1.2.3