X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fcompiler-gcc.h;h=3a9d8e7e1007ab59533a7b8bc58ec972586c7472;hp=46983308ec8f6b2e1bae224d2b971e4bccdd361b;hb=011502c8756394066172b3164567a8b9835cc280;hpb=855b49ef85d274588a2848d9c69974f9b88d343a

diff --git a/include/wimlib/compiler-gcc.h b/include/wimlib/compiler-gcc.h
index 46983308..3a9d8e7e 100644
--- a/include/wimlib/compiler-gcc.h
+++ b/include/wimlib/compiler-gcc.h
@@ -19,7 +19,8 @@
 #define _may_alias_attribute	__attribute__((may_alias))
 #define likely(expr)		__builtin_expect(!!(expr), 1)
 #define unlikely(expr)		__builtin_expect(!!(expr), 0)
-#define prefetch(addr)		__builtin_prefetch(addr)
+#define prefetchr(addr)		__builtin_prefetch((addr), 0)
+#define prefetchw(addr)		__builtin_prefetch((addr), 1)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
 #  define _cold_attribute	__attribute__((cold))
 #endif
@@ -27,7 +28,17 @@
 #define inline			inline __attribute__((always_inline))
 #define noinline		__attribute__((noinline))
 
-#define CPU_IS_BIG_ENDIAN	(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+/* Newer gcc supports __BYTE_ORDER__.  Older gcc doesn't.  */
+#ifdef __BYTE_ORDER__
+#  define CPU_IS_BIG_ENDIAN	(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#elif defined(HAVE_CONFIG_H)
+#  include "config.h"
+#  ifdef WORDS_BIGENDIAN
+#    define CPU_IS_BIG_ENDIAN 1
+#  else
+#    define CPU_IS_BIG_ENDIAN 0
+#  endif
+#endif
 
 #if defined(__x86_64__) || defined(__i386__)
 #  define UNALIGNED_ACCESS_SPEED 3