define barrier macros as nops if not otherwise defined
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
1b43ee13b3
commit
0d87f77a3f
|
@ -141,16 +141,6 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
|
||||||
# define write_mem_barrier() \
|
# define write_mem_barrier() \
|
||||||
__asm__ __volatile__ ("" : : : "memory")
|
__asm__ __volatile__ ("" : : : "memory")
|
||||||
|
|
||||||
# elif defined __arm__
|
|
||||||
|
|
||||||
# define mem_barrier() /* NOP */
|
|
||||||
# define write_mem_barrier() /* NOP */
|
|
||||||
|
|
||||||
# elif defined __arm32__
|
|
||||||
|
|
||||||
# define mem_barrier() /* NOP */
|
|
||||||
# define write_mem_barrier() /* NOP */
|
|
||||||
|
|
||||||
# elif defined __ia64__
|
# elif defined __ia64__
|
||||||
|
|
||||||
# ifndef __INTEL_COMPILER
|
# ifndef __INTEL_COMPILER
|
||||||
|
@ -163,8 +153,7 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# elif defined __mips__
|
# elif defined __mips__
|
||||||
# ifdef linux
|
# define mem_barrier() \
|
||||||
# define mem_barrier() \
|
|
||||||
__asm__ __volatile__( \
|
__asm__ __volatile__( \
|
||||||
"# prevent instructions being moved around\n\t" \
|
"# prevent instructions being moved around\n\t" \
|
||||||
".set\tnoreorder\n\t" \
|
".set\tnoreorder\n\t" \
|
||||||
|
@ -174,11 +163,7 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
|
||||||
: /* no output */ \
|
: /* no output */ \
|
||||||
: /* no input */ \
|
: /* no input */ \
|
||||||
: "memory")
|
: "memory")
|
||||||
# define write_mem_barrier() mem_barrier()
|
# define write_mem_barrier() mem_barrier()
|
||||||
|
|
||||||
# else /* !linux */
|
|
||||||
# define mem_barrier() /* NOP */
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# elif defined __powerpc__
|
# elif defined __powerpc__
|
||||||
|
|
||||||
|
@ -200,21 +185,18 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
|
||||||
# define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
|
# define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
|
||||||
# define mem_barrier() /* XXX: nop for now */
|
# define mem_barrier() /* XXX: nop for now */
|
||||||
# define write_mem_barrier() /* XXX: nop for now */
|
# define write_mem_barrier() /* XXX: nop for now */
|
||||||
|
|
||||||
# else /* ix86 */
|
|
||||||
|
|
||||||
# define mem_barrier() /* NOP */
|
|
||||||
# define write_mem_barrier() /* NOP */
|
|
||||||
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
|
|
||||||
# define mem_barrier() /* NOP */
|
|
||||||
# define write_mem_barrier() /* NOP */
|
|
||||||
|
|
||||||
# endif /* __GNUC__ */
|
# endif /* __GNUC__ */
|
||||||
# endif /* NO_INLINE */
|
# endif /* NO_INLINE */
|
||||||
|
|
||||||
|
# ifndef mem_barrier
|
||||||
|
# define mem_barrier() /* NOP */
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifndef write_mem_barrier
|
||||||
|
# define write_mem_barrier() /* NOP */
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifndef NO_INLINE
|
# ifndef NO_INLINE
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
|
# if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user