diff options
author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/20_mips_atomic_ops.diff | |
parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
download | qt4-x11-7b37d1bc4f6b27188b0688dcdc2b89db3101575c.tar.gz |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/20_mips_atomic_ops.diff')
-rw-r--r-- | debian/patches/20_mips_atomic_ops.diff | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/debian/patches/20_mips_atomic_ops.diff b/debian/patches/20_mips_atomic_ops.diff deleted file mode 100644 index 11b7fb2..0000000 --- a/debian/patches/20_mips_atomic_ops.diff +++ /dev/null @@ -1,92 +0,0 @@ -author: Thiemo Seufer <ths@debian.org> - -Fix compilation for Linux MIPS-I code. - ---- a/src/corelib/arch/mips/qatomic32.s -+++ b/src/corelib/arch/mips/qatomic32.s -@@ -7,10 +7,12 @@ - .ent q_atomic_test_and_set_int - .set mips2 - q_atomic_test_and_set_int: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 -@@ -24,6 +26,7 @@ q_atomic_test_and_set_int: - .ent q_atomic_test_and_set_acquire_int - .set mips2 - q_atomic_test_and_set_acquire_int: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 -@@ -33,6 +36,7 @@ q_atomic_test_and_set_acquire_int: - jr $31 - nop - 2: sync -+ .set mips0 - jr $31 - move $2,$0 - .set mips0 -@@ -42,11 +46,13 @@ q_atomic_test_and_set_acquire_int: - .ent q_atomic_test_and_set_release_int - .set mips2 - q_atomic_test_and_set_release_int: -+ .set mips2 - sync - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 -@@ -60,10 +66,12 @@ q_atomic_test_and_set_release_int: - .ent q_atomic_test_and_set_ptr - .set mips2 - q_atomic_test_and_set_ptr: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 -@@ -77,6 +85,7 @@ q_atomic_test_and_set_ptr: - .ent q_atomic_test_and_set_acquire_ptr - .set mips2 - q_atomic_test_and_set_acquire_ptr: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 -@@ -86,6 +95,7 @@ q_atomic_test_and_set_acquire_ptr: - jr $31 - nop - 2: sync -+ .set mips0 - jr $31 - move $2,$0 - .set mips0 -@@ -95,11 +105,13 @@ q_atomic_test_and_set_acquire_ptr: - .ent q_atomic_test_and_set_release_ptr - .set mips2 - q_atomic_test_and_set_release_ptr: -+ .set mips2 - sync - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 |