From 9b33e31d4160dc484ee569740f883f4d34e10653 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 22 Jul 2014 10:59:09 -0400 Subject: [PATCH] xfree86: Clean up powerpc barrier decls I think the externs are there for the non-gcc case? And maybe there was some assembly code to implement that once? Whatever, at this point on ppc the compiler is either gcc or willing to pretend. The macros below the decls take care of the actual eieio so the externs can just go. Also remove a comment that maybe made sense once upon a time. Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson Signed-off-by: Keith Packard --- hw/xfree86/common/compiler.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 5fd0ea035..3430585dc 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -136,11 +136,6 @@ extern _X_EXPORT void xf86WriteMmio32LeNB (void *, unsigned long, unsigned int); #endif /* __sparc__, __arm32__, __alpha__, __nds32__ */ #endif /* __arm__ */ -#if defined(__powerpc__) && !defined(__OpenBSD__) -extern void mem_barrier(void); -extern void write_mem_barrier(void); -#endif /* __powerpc__ && !__OpenBSD */ - #endif /* NO_INLINE || DO_PROTOTYPES */ #ifdef __GNUC__ @@ -195,7 +190,7 @@ extern void write_mem_barrier(void); #elif defined __powerpc__ -#ifndef eieio /* We deal with arch-specific eieio() routines above... */ +#ifndef eieio #define eieio() __asm__ __volatile__ ("eieio" ::: "memory") #endif /* eieio */ #define mem_barrier() eieio()