mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-26 09:50:39 +00:00
merge to HEAD-1.7
Original commit message from CVS: merge to HEAD-1.7
This commit is contained in:
parent
99178bcaa0
commit
f100c83060
|
@ -173,16 +173,17 @@ G_STMT_START { \
|
||||||
|
|
||||||
#define _GST_ATOMIC_SWAP(swap, val) \
|
#define _GST_ATOMIC_SWAP(swap, val) \
|
||||||
G_STMT_START { \
|
G_STMT_START { \
|
||||||
|
int tmp; \
|
||||||
__asm__ __volatile__ ("1:" \
|
__asm__ __volatile__ ("1:" \
|
||||||
" lwarx %0, 0, %2 \n" \
|
" lwarx %0, 0, %2 \n" \
|
||||||
" stwcx. %3, 0, %2 \n" \
|
" stwcx. %3, 0, %2 \n" \
|
||||||
" bne- 1b \n" \
|
" bne- 1b \n" \
|
||||||
: "=&r", \
|
: "=&r" (tmp), \
|
||||||
"=m" (*swap) \
|
"=m" (*swap) \
|
||||||
: "r" (swap), \
|
: "r" (swap), \
|
||||||
"r" (val), \
|
"r" (val), \
|
||||||
"m" (*swap) \
|
"m" (* swap) \
|
||||||
: "cc", "memory"); \
|
: "9", "cc"); \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
|
|
||||||
#define _GST_ATOMIC_SWAP_GET(swap, val, res) \
|
#define _GST_ATOMIC_SWAP_GET(swap, val, res) \
|
||||||
|
@ -196,7 +197,7 @@ G_STMT_START { \
|
||||||
: "r" (swap), \
|
: "r" (swap), \
|
||||||
"r" (val), \
|
"r" (val), \
|
||||||
"m" (*swap) \
|
"m" (*swap) \
|
||||||
: "cc", "memory"); \
|
: "cc"); \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue