[SCM] qtractor/master: Disable powerpc-specific buggy asm to fix FTBFS.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Oct 10 10:31:18 UTC 2013


The following commit has been merged in the master branch:
commit 2c4f17160a683762fae14f9c1a23b6284f7fbef0
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 10 10:33:27 2013 +0100

    Disable powerpc-specific buggy asm to fix FTBFS.
    
    Closes: #725611

diff --git a/debian/patches/04-q_atomic_ftbfs.patch b/debian/patches/04-q_atomic_ftbfs.patch
index 0044bd3..5cfd28a 100644
--- a/debian/patches/04-q_atomic_ftbfs.patch
+++ b/debian/patches/04-q_atomic_ftbfs.patch
@@ -3,12 +3,47 @@ Description: Definte generic atomic function to prevent FTBFS on most
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725611
 Author: Alessio Treglia <alessio at debian.org>
 ---
- src/qtractorAtomic.h |   12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
+ src/qtractorAtomic.h |   40 ++++++++++++----------------------------
+ 1 file changed, 12 insertions(+), 28 deletions(-)
 
 --- qtractor.orig/src/qtractorAtomic.h
 +++ qtractor/src/qtractorAtomic.h
-@@ -79,7 +79,17 @@ static inline int ATOMIC_CAS1 (
+@@ -35,33 +35,7 @@ extern "C" {
+ 
+ #if defined(__GNUC__)
+ 
+-#if defined(powerpc) || defined(__ppc__)
+-
+-static inline int ATOMIC_CAS1 (
+-	volatile int *pAddr, int iOldValue, int iNewValue )
+-{
+-	register int result;
+-	asm volatile (
+-		"# ATOMIC_CAS1			\n"
+-		"	lwarx	r0, 0, %1	\n"
+-		"	cmpw	r0, %2		\n"
+-		"	bne-	1f			\n"
+-		"	sync				\n"
+-		"	stwcx.	%3, 0, %1	\n"
+-		"	bne-	1f			\n"
+-		"	li		%0, 1		\n"
+-		"	b		2f			\n"
+-		"1:						\n"
+-		"	li		%0, 0		\n"
+-		"2:						\n"
+-		: "=r" (result)
+-		: "r" (pValue), "r" (iOldValue), "r" (iNewValue)
+-		: "r0"
+-	);
+-	return result;
+-}
+-
+-#elif defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ static inline int ATOMIC_CAS1 (
+ 	volatile int *pValue, int iOldValue, int iNewValue )
+@@ -79,7 +53,17 @@ static inline int ATOMIC_CAS1 (
  }
  
  #else

-- 
qtractor packaging



More information about the pkg-multimedia-commits mailing list