aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-03 22:32:41 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-03 22:32:41 +0000
commit1cb990bc19634ef22fc1e02377089d3e80a8e48f (patch)
tree248b628b2c5b6ab372e94e784687fc091ab6180a /sysdeps
parent733f25e6d34d8ced182ffd6366d7914d56e71d98 (diff)
downloadglibc-1cb990bc19634ef22fc1e02377089d3e80a8e48f.zip
glibc-1cb990bc19634ef22fc1e02377089d3e80a8e48f.tar.gz
glibc-1cb990bc19634ef22fc1e02377089d3e80a8e48f.tar.bz2
Update.
2003-01-03 Andreas Jaeger <aj@suse.de>, Jakub Jelinek <jakub@redhat.com> * resolv/res_libc.c: Provide declaration for __res_init_weak and reorder declarations. 2003-01-03 Art Haas <ahaas@airmail.net> * localedata/tests-mbwc/dat_iswalnum.c: Convert GCC extension initiailzer syntax to C99. * localedata/tests-mbwc/dat_iswalpha.c: Likewise. * localedata/tests-mbwc/dat_iswcntrl.c: Likewise. * localedata/tests-mbwc/dat_iswctype.c: Likewise. * localedata/tests-mbwc/dat_iswdigit.c: Likewise. * localedata/tests-mbwc/dat_iswgraph.c: Likewise. * localedata/tests-mbwc/dat_iswlower.c: Likewise. * localedata/tests-mbwc/dat_iswprint.c: Likewise. * localedata/tests-mbwc/dat_iswpunct.c: Likewise. * localedata/tests-mbwc/dat_iswspace.c: Likewise. * localedata/tests-mbwc/dat_iswupper.c: Likewise. * localedata/tests-mbwc/dat_iswxdigit.c: Likewise. * localedata/tests-mbwc/dat_mblen.c: Likewise. * localedata/tests-mbwc/dat_mbrlen.c: Likewise. * localedata/tests-mbwc/dat_mbrtowc.c: Likewise. * localedata/tests-mbwc/dat_mbsrtowcs.c: Likewise. * localedata/tests-mbwc/dat_mbstowcs.c: Likewise. * localedata/tests-mbwc/dat_mbtowc.c: Likewise. * localedata/tests-mbwc/dat_strcoll.c: Likewise. * localedata/tests-mbwc/dat_strfmon.c: Likewise. * localedata/tests-mbwc/dat_strxfrm.c: Likewise. * localedata/tests-mbwc/dat_swscanf.c: Likewise. * localedata/tests-mbwc/dat_towctrans.c: Likewise. * localedata/tests-mbwc/dat_towlower.c: Likewise. * localedata/tests-mbwc/dat_towupper.c: Likewise. * localedata/tests-mbwc/dat_wcrtomb.c: Likewise. * localedata/tests-mbwc/dat_wcscat.c: Likewise. * localedata/tests-mbwc/dat_wcschr.c: Likewise. * localedata/tests-mbwc/dat_wcscmp.c: Likewise. * localedata/tests-mbwc/dat_wcscoll.c: Likewise. * localedata/tests-mbwc/dat_wcscpy.c: Likewise. * localedata/tests-mbwc/dat_wcscspn.c: Likewise. * localedata/tests-mbwc/dat_wcslen.c: Likewise. * localedata/tests-mbwc/dat_wcsncat.c: Likewise. * localedata/tests-mbwc/dat_wcsncmp.c: Likewise. * localedata/tests-mbwc/dat_wcsncpy.c: Likewise. * localedata/tests-mbwc/dat_wcspbrk.c: Likewise. * localedata/tests-mbwc/dat_wcsrtombs.c: Likewise. * localedata/tests-mbwc/dat_wcsspn.c: Likewise. * localedata/tests-mbwc/dat_wcsstr.c: Likewise. * localedata/tests-mbwc/dat_wcstod.c: Likewise. * localedata/tests-mbwc/dat_wcstok.c: Likewise. * localedata/tests-mbwc/dat_wcstombs.c: Likewise. * localedata/tests-mbwc/dat_wcswidth.c: Likewise. * localedata/tests-mbwc/dat_wcsxfrm.c: Likewise. * localedata/tests-mbwc/dat_wctob.c: Likewise. * localedata/tests-mbwc/dat_wctomb.c: Likewise. * localedata/tests-mbwc/dat_wctrans.c: Likewise. * localedata/tests-mbwc/dat_wctype.c: Likewise. * localedata/tests-mbwc/dat_wcwidth.c: Likewise. 2003-01-03 Richard Henderson <rth@redhat.com> * sysdeps/unix/sysv/linux/alpha/sysdep.h (inline_syscall_r0_asm): New. (inline_syscall_r0_constraint): New. (inline_syscall[0-6]): Use them.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sysdep.h110
1 files changed, 66 insertions, 44 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
index da65cae..60b6eda 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h
@@ -87,44 +87,64 @@
"$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", \
"$22", "$23", "$24", "$25", "$27", "$28", "memory"
+/* If TLS is in use, we have a conflict between the PAL_rduniq primitive,
+ as modeled within GCC, and explicit use of the R0 register. If we use
+ the register via the asm, the scheduler may place the PAL_rduniq insn
+ before we've copied the data from R0 into _sc_ret. If this happens
+ we'll get a reload abort, since R0 is live at the same time it is
+ needed for the PAL_rduniq.
+
+ Solve this by using the "v" constraint instead of an asm for the syscall
+ output. We don't do this unconditionally to allow compilation with
+ older compilers. */
+
+#ifdef USE_TLS
+#define inline_syscall_r0_asm
+#define inline_syscall_r0_constraint "v"
+#else
+#define inline_syscall_r0_asm __asm__("$0")
+#define inline_syscall_r0_constraint "r"
+#endif
+
/* It is moderately important optimization-wise to limit the lifetime
of the hard-register variables as much as possible. Thus we copy
in/out as close to the asm as possible. */
-#define inline_syscall0(name) \
-{ \
- register long _sc_0 __asm__("$0"); \
- register long _sc_19 __asm__("$19"); \
- \
- _sc_0 = __NR_##name; \
- __asm__("callsys # %0 %1 <= %2" \
- : "=r"(_sc_0), "=r"(_sc_19) \
- : "0"(_sc_0) \
- : inline_syscall_clobbers, \
- "$16", "$17", "$18", "$20", "$21"); \
- _sc_ret = _sc_0, _sc_err = _sc_19; \
+#define inline_syscall0(name, args...) \
+{ \
+ register long _sc_0 inline_syscall_r0_asm; \
+ register long _sc_19 __asm__("$19"); \
+ \
+ _sc_0 = __NR_##name; \
+ __asm__("callsys # %0 %1 <= %2" \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19) \
+ : "0"(_sc_0) \
+ : inline_syscall_clobbers, \
+ "$16", "$17", "$18", "$20", "$21"); \
+ _sc_ret = _sc_0, _sc_err = _sc_19; \
}
-#define inline_syscall1(name,arg1) \
-{ \
- register long _sc_0 __asm__("$0"); \
- register long _sc_16 __asm__("$16"); \
- register long _sc_19 __asm__("$19"); \
- \
- _sc_0 = __NR_##name; \
- _sc_16 = (long) (arg1); \
- __asm__("callsys # %0 %1 <= %2 %3" \
- : "=r"(_sc_0), "=r"(_sc_19), \
- "=r"(_sc_16) \
- : "0"(_sc_0), "2"(_sc_16) \
- : inline_syscall_clobbers, \
- "$17", "$18", "$20", "$21"); \
- _sc_ret = _sc_0, _sc_err = _sc_19; \
+#define inline_syscall1(name,arg1) \
+{ \
+ register long _sc_0 inline_syscall_r0_asm; \
+ register long _sc_16 __asm__("$16"); \
+ register long _sc_19 __asm__("$19"); \
+ \
+ _sc_0 = __NR_##name; \
+ _sc_16 = (long) (arg1); \
+ __asm__("callsys # %0 %1 <= %2 %3" \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19), "=r"(_sc_16) \
+ : "0"(_sc_0), "2"(_sc_16) \
+ : inline_syscall_clobbers, \
+ "$17", "$18", "$20", "$21"); \
+ _sc_ret = _sc_0, _sc_err = _sc_19; \
}
#define inline_syscall2(name,arg1,arg2) \
{ \
- register long _sc_0 __asm__("$0"); \
+ register long _sc_0 inline_syscall_r0_asm; \
register long _sc_16 __asm__("$16"); \
register long _sc_17 __asm__("$17"); \
register long _sc_19 __asm__("$19"); \
@@ -133,8 +153,8 @@
_sc_16 = (long) (arg1); \
_sc_17 = (long) (arg2); \
__asm__("callsys # %0 %1 <= %2 %3 %4" \
- : "=r"(_sc_0), "=r"(_sc_19), \
- "=r"(_sc_16), "=r"(_sc_17) \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17) \
: "0"(_sc_0), "2"(_sc_16), "3"(_sc_17) \
: inline_syscall_clobbers, \
"$18", "$20", "$21"); \
@@ -143,7 +163,7 @@
#define inline_syscall3(name,arg1,arg2,arg3) \
{ \
- register long _sc_0 __asm__("$0"); \
+ register long _sc_0 inline_syscall_r0_asm; \
register long _sc_16 __asm__("$16"); \
register long _sc_17 __asm__("$17"); \
register long _sc_18 __asm__("$18"); \
@@ -154,8 +174,9 @@
_sc_17 = (long) (arg2); \
_sc_18 = (long) (arg3); \
__asm__("callsys # %0 %1 <= %2 %3 %4 %5" \
- : "=r"(_sc_0), "=r"(_sc_19), \
- "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18) \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \
+ "=r"(_sc_18) \
: "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \
"4"(_sc_18) \
: inline_syscall_clobbers, "$20", "$21"); \
@@ -164,7 +185,7 @@
#define inline_syscall4(name,arg1,arg2,arg3,arg4) \
{ \
- register long _sc_0 __asm__("$0"); \
+ register long _sc_0 inline_syscall_r0_asm; \
register long _sc_16 __asm__("$16"); \
register long _sc_17 __asm__("$17"); \
register long _sc_18 __asm__("$18"); \
@@ -176,8 +197,9 @@
_sc_18 = (long) (arg3); \
_sc_19 = (long) (arg4); \
__asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6" \
- : "=r"(_sc_0), "=r"(_sc_19), \
- "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18) \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \
+ "=r"(_sc_18) \
: "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \
"4"(_sc_18), "1"(_sc_19) \
: inline_syscall_clobbers, "$20", "$21"); \
@@ -186,7 +208,7 @@
#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \
{ \
- register long _sc_0 __asm__("$0"); \
+ register long _sc_0 inline_syscall_r0_asm; \
register long _sc_16 __asm__("$16"); \
register long _sc_17 __asm__("$17"); \
register long _sc_18 __asm__("$18"); \
@@ -200,9 +222,9 @@
_sc_19 = (long) (arg4); \
_sc_20 = (long) (arg5); \
__asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7" \
- : "=r"(_sc_0), "=r"(_sc_19), \
- "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18), \
- "=r"(_sc_20) \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \
+ "=r"(_sc_18), "=r"(_sc_20) \
: "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \
"4"(_sc_18), "1"(_sc_19), "5"(_sc_20) \
: inline_syscall_clobbers, "$21"); \
@@ -211,7 +233,7 @@
#define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6) \
{ \
- register long _sc_0 __asm__("$0"); \
+ register long _sc_0 inline_syscall_r0_asm; \
register long _sc_16 __asm__("$16"); \
register long _sc_17 __asm__("$17"); \
register long _sc_18 __asm__("$18"); \
@@ -227,9 +249,9 @@
_sc_20 = (long) (arg5); \
_sc_21 = (long) (arg6); \
__asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7 %8" \
- : "=r"(_sc_0), "=r"(_sc_19) \
- "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18), \
- "=r"(_sc_20), "=r"(_sc_21) \
+ : "=" inline_syscall_r0_constraint (_sc_0), \
+ "=r"(_sc_19) "=r"(_sc_16), "=r"(_sc_17), \
+ "=r"(_sc_18), "=r"(_sc_20), "=r"(_sc_21) \
: "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \
"4"(_sc_18), "1"(_sc_19), "5"(_sc_20), \
"6"(_sc_21) \