[mupen64plus-core] 86/310: Don't use _BIG_ENDIAN to check for endianness

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 5833f1bd0e4b2730931e99523adb14da8541fc77
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 10:11:55 2011 +0200

    Don't use _BIG_ENDIAN to check for endianness
---
 debian/changelog                         |  2 +
 debian/patches/big_endian_conflict.patch | 67 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 70 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a1a11d4..c4cfe42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mupen64plus-core (1.99.4-3) UNRELEASED; urgency=low
     - Remove obsolete default-optimisations.patch
     - Rebase debian/patches/dejavu-font.patch
     - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
+    - Add big_endian_conflict.patch, Don't use _BIG_ENDIAN to check for
+      endianness
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 13 Jul 2011 08:38:54 +0200
 
diff --git a/debian/patches/big_endian_conflict.patch b/debian/patches/big_endian_conflict.patch
new file mode 100644
index 0000000..bfb2505
--- /dev/null
+++ b/debian/patches/big_endian_conflict.patch
@@ -0,0 +1,67 @@
+Description: Don't use _BIG_ENDIAN to check for endianness
+ _BIG_ENDIAN is always enabled on some systems and would create wrong results.
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-ui-console/changeset/c8d7df4d5615
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/memory/memory.c b/src/memory/memory.c
+index 108f8dd25264d420ed76c81df9052ddfe15578ad..9d49193d58a6de928dbf02c1128df749a6ab04d6 100644
+--- a/src/memory/memory.c
++++ b/src/memory/memory.c
+@@ -72,7 +72,7 @@ unsigned char *PIF_RAMb = (unsigned char *)(PIF_RAM);
+ // address : address of the read/write operation being done
+ unsigned int address = 0;
+ // *address_low = the lower 16 bit of the address :
+-#ifdef _BIG_ENDIAN
++#ifdef M64P_BIG_ENDIAN
+ static unsigned short *address_low = (unsigned short *)(&address)+1; 
+ #else
+ static unsigned short *address_low = (unsigned short *)(&address);
+diff --git a/src/memory/memory.h b/src/memory/memory.h
+index b681bb746ff6698516354d746d60c2b23d91c592..17c6565f0e481b34d8c4004d1d69a7b0061b8c27 100644
+--- a/src/memory/memory.h
++++ b/src/memory/memory.h
+@@ -241,7 +241,7 @@ extern DPS_register dps_register;
+ 
+ extern unsigned char *rdramb;
+ 
+-#ifndef _BIG_ENDIAN
++#ifndef M64P_BIG_ENDIAN
+ #define sl(mot) \
+ ( \
+ ((mot & 0x000000FF) << 24) | \
+diff --git a/src/r4300/macros.h b/src/r4300/macros.h
+index 1846bf26c996bb55938340576a903cbd007180aa..b3f08f5e8b22a56ab2b49a70306f4ffea27eddaa 100644
+--- a/src/r4300/macros.h
++++ b/src/r4300/macros.h
+@@ -49,7 +49,7 @@
+ #define cffd PC->f.cf.fd
+ 
+ // 32 bits macros
+-#ifndef _BIG_ENDIAN
++#ifndef M64P_BIG_ENDIAN
+ #define rrt32 *((int*)PC->f.r.rt)
+ #define rrd32 *((int*)PC->f.r.rd)
+ #define rrs32 *((int*)PC->f.r.rs)
+diff --git a/src/r4300/r4300.c b/src/r4300/r4300.c
+index 99d85be512aafd0eff9973dca7dd3fc31ac39c59..f1d9ef9a06ca06713f1d3cd3044bcb3e7a64f6f5 100644
+--- a/src/r4300/r4300.c
++++ b/src/r4300/r4300.c
+@@ -1497,7 +1497,7 @@ void jump_to_func(void)
+ */
+ void shuffle_fpr_data(int oldStatus, int newStatus)
+ {
+-#if defined(_BIG_ENDIAN)
++#if defined(M64P_BIG_ENDIAN)
+     const int isBigEndian = 1;
+ #else
+     const int isBigEndian = 0;
+@@ -1550,7 +1550,7 @@ void shuffle_fpr_data(int oldStatus, int newStatus)
+ void set_fpr_pointers(int newStatus)
+ {
+     int i;
+-#if defined(_BIG_ENDIAN)
++#if defined(M64P_BIG_ENDIAN)
+     const int isBigEndian = 1;
+ #else
+     const int isBigEndian = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 9d5f10e..fa8d4a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ api_header.patch
 rtc.patch
 n64_romswap.patch
 rjump_globber.patch
+big_endian_conflict.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git