diff options
author | Ana Beatriz Guerrero Lopez <ana@debian.org> | 2009-02-18 00:02:37 +0000 |
---|---|---|
committer | Ana Beatriz Guerrero Lopez <ana@debian.org> | 2009-02-18 00:02:37 +0000 |
commit | 9f72af579a1d31c2ac9572b9b1fb94345ce5043a (patch) | |
tree | b084fb0ff03bac29430b5f2213dd19b06614d2f2 /debian/patches/20_mips_atomic_ops.diff | |
parent | 9a2df626010f7cbccdc812aec07172e0ebd2d128 (diff) | |
parent | 27f5b1f4b636b2efd947f3535f056714d32daa02 (diff) | |
download | qt4-x11-9f72af579a1d31c2ac9572b9b1fb94345ce5043a.tar.gz |
moved stuff from trunk/
Diffstat (limited to 'debian/patches/20_mips_atomic_ops.diff')
-rw-r--r-- | debian/patches/20_mips_atomic_ops.diff | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/debian/patches/20_mips_atomic_ops.diff b/debian/patches/20_mips_atomic_ops.diff index 5e15f58..11b7fb2 100644 --- a/debian/patches/20_mips_atomic_ops.diff +++ b/debian/patches/20_mips_atomic_ops.diff @@ -4,9 +4,9 @@ Fix compilation for Linux MIPS-I code. --- a/src/corelib/arch/mips/qatomic32.s +++ b/src/corelib/arch/mips/qatomic32.s -@@ -6,10 +6,12 @@ - .globl q_atomic_test_and_set_int +@@ -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) @@ -17,25 +17,25 @@ Fix compilation for Linux MIPS-I code. beqz $2,1b nop jr $31 -@@ -21,6 +23,7 @@ - .globl q_atomic_test_and_set_acquire_int +@@ -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 -@@ -30,6 +33,7 @@ +@@ -33,6 +36,7 @@ q_atomic_test_and_set_acquire_int: jr $31 nop 2: sync + .set mips0 jr $31 move $2,$0 - .end q_atomic_test_and_set_acquire_int -@@ -37,11 +41,13 @@ - .globl q_atomic_test_and_set_release_int + .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 @@ -47,9 +47,9 @@ Fix compilation for Linux MIPS-I code. beqz $2,1b nop jr $31 -@@ -53,10 +59,12 @@ - .globl q_atomic_test_and_set_ptr +@@ -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) @@ -60,25 +60,25 @@ Fix compilation for Linux MIPS-I code. beqz $2,1b nop jr $31 -@@ -68,6 +76,7 @@ - .globl q_atomic_test_and_set_acquire_ptr +@@ -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 -@@ -77,6 +86,7 @@ +@@ -86,6 +95,7 @@ q_atomic_test_and_set_acquire_ptr: jr $31 nop 2: sync + .set mips0 jr $31 move $2,$0 - .end q_atomic_test_and_set_acquire_ptr -@@ -84,11 +94,13 @@ - .globl q_atomic_test_and_set_release_ptr + .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 |