@@ -1,4 +1,8 @@
+ifeq ($(subdir),csu)
+sysdep_routines += syscall_error_asm
+endif
+
ifeq ($(subdir),rt)
-librt-sysdep_routines += rt-sysdep
-librt-shared-only-routines += rt-sysdep
+librt-routines += syscall_error_asm
+librt-shared-only-routines += syscall_error_asm
endif
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdep.S>
similarity index 94%
rename from sysdeps/unix/alpha/sysdep.S
rename to sysdeps/unix/alpha/syscall_error_asm.S
@@ -35,9 +35,9 @@
#endif
.align 4
- .globl __syscall_error
- .ent __syscall_error
-__syscall_error:
+ .globl __syscall_error_asm
+ .ent __syscall_error_asm
+__syscall_error_asm:
/* When building a shared library, we branch here without having
loaded the GP. Nor, since it was a direct branch, have we
loaded PV with our address.
@@ -62,4 +62,4 @@ __syscall_error:
stl t0, 0(t1)
ret
- .end __syscall_error
+ .end __syscall_error_asm
@@ -31,8 +31,7 @@ libm-routines += multc3 divtc3
endif # math
ifeq ($(subdir),nptl)
-# pull in __syscall_error routine, sigaction stubs.
-libpthread-routines += sysdep rt_sigaction
+libpthread-routines += rt_sigaction
libpthread-shared-only-routines += sysdep rt_sigaction
endif
@@ -102,14 +102,14 @@ $syscall_error: \
ret
# define SYSCALL_ERROR_FALLTHRU
#elif defined(PIC)
-# define SYSCALL_ERROR_LABEL __syscall_error !samegp
+# define SYSCALL_ERROR_LABEL __syscall_error_asm !samegp
# define SYSCALL_ERROR_HANDLER
# define SYSCALL_ERROR_FALLTHRU br SYSCALL_ERROR_LABEL
#else
# define SYSCALL_ERROR_LABEL $syscall_error
# define SYSCALL_ERROR_HANDLER \
$syscall_error: \
- jmp $31, __syscall_error
+ jmp $31, __syscall_error_asm
# define SYSCALL_ERROR_FALLTHRU
#endif /* RTLD_PRIVATE_ERRNO */