From 0b17d90591759fccd1dcb37247425064773a413b Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Wed, 16 Apr 2008 14:24:58 +0000 Subject: Fix whitespace damage in AVR32 pt-machine.h in libpthread, linuxthreads and linuxthreads.old. --- .../linuxthreads.old/sysdeps/avr32/pt-machine.h | 46 +++++++++++----------- libpthread/linuxthreads/sysdeps/avr32/pt-machine.h | 46 +++++++++++----------- 2 files changed, 46 insertions(+), 46 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h index c9669f2d3..cd45d5faf 100644 --- a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h @@ -18,16 +18,16 @@ static inline int _test_and_set (int *p, int v) { - int result; + int result; - __asm__ __volatile__( - "/* Inline test and set */\n" - " xchg %[old], %[mem], %[new]" - : [old] "=&r"(result) - : [mem] "r"(p), [new] "r"(v) - : "memory"); + __asm__ __volatile__( + "/* Inline test and set */\n" + " xchg %[old], %[mem], %[new]" + : [old] "=&r"(result) + : [mem] "r"(p), [new] "r"(v) + : "memory"); - return result; + return result; } extern long int testandset (int *spinlock); @@ -37,7 +37,7 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); PT_EI long int testandset (int *spinlock) { - return _test_and_set(spinlock, 1); + return _test_and_set(spinlock, 1); } @@ -52,22 +52,22 @@ register char * stack_pointer __asm__ ("sp"); PT_EI int __compare_and_swap(long int *p, long int oldval, long int newval) { - long int result; + long int result; - __asm__ __volatile__( - "/* Inline compare and swap */\n" - "1: ssrf 5\n" - " ld.w %[result], %[mem]\n" - " eor %[result], %[old]\n" - " brne 2f\n" - " stcond %[mem], %[new]\n" - " brne 1b\n" - "2:" - : [result] "=&r"(result), [mem] "=m"(*p) - : "m"(*p), [new] "r"(newval), [old] "r"(oldval) - : "cc", "memory"); + __asm__ __volatile__( + "/* Inline compare and swap */\n" + "1: ssrf 5\n" + " ld.w %[result], %[mem]\n" + " eor %[result], %[old]\n" + " brne 2f\n" + " stcond %[mem], %[new]\n" + " brne 1b\n" + "2:" + : [result] "=&r"(result), [mem] "=m"(*p) + : "m"(*p), [new] "r"(newval), [old] "r"(oldval) + : "cc", "memory"); - return result == 0; + return result == 0; } #endif /* pt-machine.h */ diff --git a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h index 903a7ed54..b93bc47f0 100644 --- a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h @@ -18,16 +18,16 @@ static inline int _test_and_set (int *p, int v) __THROW { - int result; + int result; - __asm__ __volatile__( - "/* Inline test and set */\n" - " xchg %[old], %[mem], %[new]" - : [old] "=&r"(result) - : [mem] "r"(p), [new] "r"(v) - : "memory"); + __asm__ __volatile__( + "/* Inline test and set */\n" + " xchg %[old], %[mem], %[new]" + : [old] "=&r"(result) + : [mem] "r"(p), [new] "r"(v) + : "memory"); - return result; + return result; } extern long int testandset (int *spinlock); @@ -37,7 +37,7 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); PT_EI long int testandset (int *spinlock) { - return _test_and_set(spinlock, 1); + return _test_and_set(spinlock, 1); } @@ -52,22 +52,22 @@ register char * stack_pointer __asm__ ("sp"); PT_EI int __compare_and_swap(long int *p, long int oldval, long int newval) { - int result; + int result; - __asm__ __volatile__( - "/* Inline compare and swap */\n" - "1: ssrf 5\n" - " ld.w %[result], %[mem]\n" - " eor %[result], %[old]\n" - " brne 2f\n" - " stcond %[mem], %[new]\n" - " brne 1b\n" - "2:" - : [result] "=&r"(result), [mem] "=m"(*p) - : "m"(*p), [new] "r"(newval), [old] "r"(oldval) - : "cc", "memory"); + __asm__ __volatile__( + "/* Inline compare and swap */\n" + "1: ssrf 5\n" + " ld.w %[result], %[mem]\n" + " eor %[result], %[old]\n" + " brne 2f\n" + " stcond %[mem], %[new]\n" + " brne 1b\n" + "2:" + : [result] "=&r"(result), [mem] "=m"(*p) + : "m"(*p), [new] "r"(newval), [old] "r"(oldval) + : "cc", "memory"); - return result == 0; + return result == 0; } #endif /* pt-machine.h */ -- cgit v1.2.3