[mupen64plus-core] 157/310: Fix name of PIC thunks with gcc 4.7

[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 58489ce57e472322cb8bc41786a2fe815c1452ea
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 15 23:06:44 2012 +0200

    Fix name of PIC thunks with gcc 4.7
---
 debian/changelog                 |  8 ++++++++
 debian/patches/rjump_gcc47.patch | 23 +++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfb1dbb..4078c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus-core (1.99.5-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add rjump_gcc47.patch, Fix name of PIC thunks with gcc 4.7
+      (Closes: #672991)
+
+ -- Sven Eckelmann <sven at narfation.org>  Tue, 15 May 2012 23:05:52 +0200
+
 mupen64plus-core (1.99.5-3) unstable; urgency=low
 
   * Add mupen64plus-data binary package for the rom catalog and cheat database 
diff --git a/debian/patches/rjump_gcc47.patch b/debian/patches/rjump_gcc47.patch
new file mode 100644
index 0000000..3ad6a74
--- /dev/null
+++ b/debian/patches/rjump_gcc47.patch
@@ -0,0 +1,23 @@
+Description: Fix name of PIC thunks with gcc 4.7
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/r4300/x86/rjump.c b/src/r4300/x86/rjump.c
+index 0fb8bba01e076549d223954ead414d1143a969a6..6007025b420e805034e8f3abe2a048fbca8b62dc 100644
+--- a/src/r4300/x86/rjump.c
++++ b/src/r4300/x86/rjump.c
+@@ -94,8 +94,13 @@ void dyna_start(void (*code)(void))
+ #elif defined(__GNUC__) && defined(__i386__)
+   #if defined(__PIC__)
+     /* for -fPIC (shared libraries) */
++    #if __GNUC_PREREQ (4, 7)
++    #  define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
++    #else
++    #  define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
++    #endif
+     #define STORE_EBX
+-    #define LOAD_EBX "call  __i686.get_pc_thunk.bx       \n" \
++    #define LOAD_EBX "call  " GET_PC_THUNK_STR(bx) "     \n" \
+                      "addl $_GLOBAL_OFFSET_TABLE_, %%ebx \n"
+   #else
+     /* for non-PIC binaries */
diff --git a/debian/patches/series b/debian/patches/series
index ce57e26..12cfbc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ dejavu-font.patch
 printf_fixup.patch
 floatingpoint_config.patch
 debugger_memory_breakpoints.patch
+rjump_gcc47.patch

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