diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-04-24 09:24:59 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-04-24 09:24:59 +0000 |
| commit | 1d8abd74c4ae9b28035b549345f9f736cdb98c10 (patch) | |
| tree | 9a534ad59f2ddfc18076a92e3331128d4c5bd2da /libpthread/linuxthreads.old/sysdeps/i386 | |
| parent | 1db4be5334a327dde925c73b8d924440257cf487 (diff) | |
- fixup asm. No object-code changes
Diffstat (limited to 'libpthread/linuxthreads.old/sysdeps/i386')
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/i386/tls.h | 8 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/i386/useldt.h | 12 |
2 files changed, 10 insertions, 10 deletions
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; \ |