[mupen64plus-video-rice] 62/191: Fix definition of PIC code after Makefile rewrite

[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-video-rice.

commit a72b4a0699e43351422e0b2890d3945525209d7d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 01:23:24 2011 +0200

    Fix definition of PIC code after Makefile rewrite
---
 debian/patches/rewrite_makefile.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
index 9d5a779..8667c87 100644
--- a/debian/patches/rewrite_makefile.patch
+++ b/debian/patches/rewrite_makefile.patch
@@ -261,3 +261,34 @@ index cc275e6f2dd4a02ef3a404789bf7cf56cbfc10c7..784dd54ea26fa0997600aa4b23bec59e
 +	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
 +
 +.PHONY: all clean install uninstall targets
+diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
+index 5b3f52eb66c5a34aa146a624d2b80f209c3fc29b..9d4cff06664e22e61561cbbe8753ac175863c7a3 100644
+--- a/src/FrameBuffer.cpp
++++ b/src/FrameBuffer.cpp
+@@ -674,7 +674,7 @@ l1:             mov esi, [ecx+ebx]
+                      : "%rbx", "%rax", "memory", "cc"
+                      );
+ #elif !defined(NO_ASM)
+-# ifndef PIC
++# if !defined(__PIC__)
+            asm volatile("pusha                             \n"
+                 "mov    pAsmStart, %%ecx           \n"  // = pStart
+                 "mov    $0, %%edx                  \n"          // The CRC
+@@ -701,7 +701,7 @@ l1:             mov esi, [ecx+ebx]
+                 :
+                 : "memory", "cc"
+                 );
+-# else // PIC
++# else // defined(__PIC__)
+            unsigned int saveEBX;
+            unsigned int saveEAX;
+            unsigned int saveECX;
+@@ -747,7 +747,7 @@ l1:             mov esi, [ecx+ebx]
+                 : "memory", "cc"
+                 );
+            dwAsmCRC = asmCRC;
+-# endif // PIC
++# endif // defined(__PIC__)
+ #endif
+         }
+         catch(...)

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