summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads.old
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-04-24 09:24:59 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-04-24 09:24:59 +0000
commit1d8abd74c4ae9b28035b549345f9f736cdb98c10 (patch)
tree9a534ad59f2ddfc18076a92e3331128d4c5bd2da /libpthread/linuxthreads.old
parent1db4be5334a327dde925c73b8d924440257cf487 (diff)
- fixup asm. No object-code changes
Diffstat (limited to 'libpthread/linuxthreads.old')
-rw-r--r--libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h2
-rw-r--r--libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h4
-rw-r--r--libpthread/linuxthreads.old/sysdeps/i386/tls.h8
-rw-r--r--libpthread/linuxthreads.old/sysdeps/i386/useldt.h12
-rw-r--r--libpthread/linuxthreads.old/sysdeps/sh/tls.h2
-rw-r--r--libpthread/linuxthreads.old/sysdeps/x86_64/tls.h2
6 files changed, 15 insertions, 15 deletions
diff --git a/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
index 9f5cb5c1f..e81ecffbe 100644
--- a/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
@@ -70,7 +70,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
#ifdef SHARED
# define PTHREAD_STATIC_FN_REQUIRE(name)
#else
-# define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " "_"#name);
+# define PTHREAD_STATIC_FN_REQUIRE(name) __asm__ (".globl " "_"#name);
#endif
#endif /* pt-machine.h */
diff --git a/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
index 2317b65a0..9c9d0d76a 100644
--- a/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
@@ -35,7 +35,7 @@ PT_EI long int
testandset (int *spinlock)
{
int i = 1;
- asm ("swap%I0 %M0, %1" : "+m"(*(volatile int *)spinlock), "+r"(i));
+ __asm__ ("swap%I0 %M0, %1" : "+m"(*(volatile int *)spinlock), "+r"(i));
return i;
}
@@ -53,7 +53,7 @@ extern char __stacksize;
#define WRITE_MEMORY_BARRIER() __asm__ __volatile__("membar" : : : "memory")
/* Return the thread descriptor for the current thread. */
-register struct _pthread_descr_struct *THREAD_SELF asm ("gr29");
+register struct _pthread_descr_struct *THREAD_SELF __asm__ ("gr29");
#define THREAD_SELF THREAD_SELF
/* Initialize the thread-unique value. */
diff --git a/libpthread/linuxthreads.old/sysdeps/i386/tls.h b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
index e4f007ee3..8534cab80 100644
--- a/libpthread/linuxthreads.old/sysdeps/i386/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
@@ -104,7 +104,7 @@ typedef struct
{ nr, (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \
1, 0, 0, 1, 0, 1, 0 }; \
int result; \
- asm volatile (TLS_LOAD_EBX \
+ __asm__ __volatile__ (TLS_LOAD_EBX \
"int $0x80\n\t" \
TLS_LOAD_EBX \
: "=a" (result) \
@@ -125,9 +125,9 @@ typedef struct
int result; \
if (secondcall) \
ldt_entry.entry_number = ({ int _gs; \
- asm ("movw %%gs, %w0" : "=q" (_gs)); \
+ __asm__ ("movw %%gs, %w0" : "=q" (_gs)); \
(_gs & 0xffff) >> 3; }); \
- asm volatile (TLS_LOAD_EBX \
+ __asm__ __volatile__ (TLS_LOAD_EBX \
"int $0x80\n\t" \
TLS_LOAD_EBX \
: "=a" (result), "=m" (ldt_entry.entry_number) \
@@ -167,7 +167,7 @@ typedef struct
__gs = TLS_SETUP_GS_SEGMENT (_descr, secondcall); \
if (__builtin_expect (__gs, 7) != -1) \
{ \
- asm ("movw %w0, %%gs" : : "q" (__gs)); \
+ __asm__ ("movw %w0, %%gs" : : "q" (__gs)); \
__gs = 0; \
} \
__gs; \
diff --git a/libpthread/linuxthreads.old/sysdeps/i386/useldt.h b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
index 16aee9989..ca5677cc9 100644
--- a/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
@@ -71,7 +71,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
1, 0, 0, 1, 0, 1, 0 }; \
if (__modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) \
abort (); \
- asm ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \
+ __asm__ ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \
})
#ifdef __PIC__
@@ -97,21 +97,21 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
int __gs; \
if (DO_SET_THREAD_AREA_REUSE (nr)) \
{ \
- asm ("movw %%gs, %w0" : "=q" (__gs)); \
+ __asm__ ("movw %%gs, %w0" : "=q" (__gs)); \
struct modify_ldt_ldt_s ldt_entry = \
{ (__gs & 0xffff) >> 3, \
(unsigned long int) (descr), 0xfffff /* 4GB in pages */, \
1, 0, 0, 1, 0, 1, 0 }; \
\
int __result; \
- __asm (USETLS_LOAD_EBX \
+ __asm__ (USETLS_LOAD_EBX \
"movl %2, %%eax\n\t" \
"int $0x80\n\t" \
USETLS_LOAD_EBX \
: "&a" (__result) \
: USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area)); \
if (__result == 0) \
- asm ("movw %w0, %%gs" :: "q" (__gs)); \
+ __asm__ ("movw %w0, %%gs" :: "q" (__gs)); \
else \
__gs = -1; \
} \
@@ -122,7 +122,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
(unsigned long int) (descr), 0xfffff /* 4GB in pages */, \
1, 0, 0, 1, 0, 1, 0 }; \
int __result; \
- __asm (USETLS_LOAD_EBX \
+ __asm__ (USETLS_LOAD_EBX \
"movl %2, %%eax\n\t" \
"int $0x80\n\t" \
USETLS_LOAD_EBX \
@@ -131,7 +131,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
if (__result == 0) \
{ \
__gs = (ldt_entry.entry_number << 3) + 3; \
- asm ("movw %w0, %%gs" : : "q" (__gs)); \
+ __asm__ ("movw %w0, %%gs" : : "q" (__gs)); \
} \
else \
__gs = -1; \
diff --git a/libpthread/linuxthreads.old/sysdeps/sh/tls.h b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
index 75326d8e1..7bc29800a 100644
--- a/libpthread/linuxthreads.old/sysdeps/sh/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
@@ -100,7 +100,7 @@ typedef struct
/* For now the thread descriptor is at the same address. */ \
head->self = _descr; \
\
- asm ("ldc %0,gbr" : : "r" (_descr)); \
+ __asm__ ("ldc %0,gbr" : : "r" (_descr)); \
\
0; \
})
diff --git a/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
index d67275c10..5e7239d17 100644
--- a/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
@@ -108,7 +108,7 @@ typedef struct
/* For now the thread descriptor is at the same address. */ \
head->self = _descr; \
\
- asm volatile ("syscall" \
+ __asm__ __volatile__ ("syscall" \
: "=a" (_result) \
: "0" ((unsigned long int) __NR_arch_prctl), \
"D" ((unsigned long int) ARCH_SET_FS), \