From aabe2441765c632bba697945491e3e0ac29ac886 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 8 Jan 2011 19:49:38 +0100
Subject: [PATCH] build-sys: use WORDS_BIGENDIAN to determine platform
 byte-order

Autoconf contains the right magic to determine the endianness on many
platforms next to Linux.  This reverses previous commits to move away
from WORDS_BIGENDIAN:
"use __BYTE_ORDER rather than AC specific WORDS_BIGENDIAN"

This is necessary to compile on non Linux platforms like Darwin and
Solaris.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
 include/bitops.h             | 11 +++--------
 lib/md5.c                    |  7 +------
 sys-utils/lscpu.c            |  4 +---
 tests/helpers/test_sysinfo.c |  7 +------
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/include/bitops.h b/include/bitops.h
index e283b835..80d6f6f0 100644
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -2,7 +2,6 @@
 #define BITOPS_H
 
 #include <stdint.h>
-#include <endian.h>
 
 /*
  * Bit map related macros. Usually provided by libc.
@@ -20,10 +19,6 @@
 # define isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
 #endif
 
-#if !defined __BYTE_ORDER || !(__BYTE_ORDER == __LITTLE_ENDIAN) && !(__BYTE_ORDER == __BIG_ENDIAN)
-#error missing __BYTE_ORDER
-#endif
-
 /*
  * Byte swab macros (based on linux/byteorder/swab.h)
  */
@@ -51,7 +46,7 @@
 		(uint64_t)(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) ))
 
 
-#if (__BYTE_ORDER == __BIG_ENDIAN)
+#ifdef WORDS_BIGENDIAN
 
 #define cpu_to_le16(x) swab16(x)
 #define cpu_to_le32(x) swab32(x)
@@ -67,7 +62,7 @@
 #define be32_to_cpu(x) (x)
 #define be64_to_cpu(x) (x)
 
-#else /* __BYTE_ORDER != __BIG_ENDIAN */
+#else /* !WORDS_BIGENDIAN */
 
 #define cpu_to_le16(x) (x)
 #define cpu_to_le32(x) (x)
@@ -83,7 +78,7 @@
 #define be32_to_cpu(x) swab32(x)
 #define be64_to_cpu(x) swab64(x)
 
-#endif /* __BYTE_ORDER */
+#endif /* WORDS_BIGENDIAN */
 
 #endif /* BITOPS_H */
 
diff --git a/lib/md5.c b/lib/md5.c
index 6ad4b684..071630f1 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -14,16 +14,11 @@
  * needed on buffers full of bytes, and then call MD5Final, which
  * will fill a supplied 16-byte array with the digest.
  */
-#include <endian.h>
 #include <string.h>		/* for memcpy() */
 
 #include "md5.h"
 
-#if !defined __BYTE_ORDER || !(__BYTE_ORDER == __LITTLE_ENDIAN) && !(__BYTE_ORDER == __BIG_ENDIAN)
-#error missing __BYTE_ORDER
-#endif
-
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#if !defined(WORDS_BIGENDIAN)
 #define byteReverse(buf, len)	/* Nothing */
 #else
 void byteReverse(unsigned char *buf, unsigned longs);
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 224d5f99..16e6b9a1 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -818,12 +818,10 @@ print_readable(struct lscpu_desc *desc, int hex)
 		*(p - 2) = '\0';
 		print_s(_("CPU op-mode(s):"), buf);
 	}
-#ifdef __BYTE_ORDER
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#if !defined(WORDS_BIGENDIAN)
 	print_s(_("Byte Order:"), "Little Endian");
 #else
 	print_s(_("Byte Order:"), "Big Endian");
-#endif
 #endif
 	print_n(_("CPU(s):"), desc->ncpus);
 
diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
index 9c841dbf..cb7b66b1 100644
--- a/tests/helpers/test_sysinfo.c
+++ b/tests/helpers/test_sysinfo.c
@@ -18,13 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <endian.h>
 #include <limits.h>
 
-#if !defined __BYTE_ORDER || !(__BYTE_ORDER == __LITTLE_ENDIAN) && !(__BYTE_ORDER == __BIG_ENDIAN)
-#error missing __BYTE_ORDER
-#endif
-
 typedef struct {
 	const char	*name;
 	int		(*fnc)(void);
@@ -40,7 +35,7 @@ hlp_wordsize(void)
 int
 hlp_endianness(void)
 {
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#if !defined(WORDS_BIGENDIAN)
 	printf("LE\n");
 #else
 	printf("BE\n");
-- 
2.39.5