diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-01-12 00:08:43 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-01-12 00:08:43 +0000 |
commit | e4e08626fc324d0904917d2650d07f97514bcfb2 (patch) | |
tree | 510dc5baacc220e9029fac24eca0d0c49cc8cc4d /lib/libc/arch | |
parent | 22fa157fce1468f47c69a4cc4a3b2e6dc3b2fcd8 (diff) |
ugly workaround for an .align parse bug in current binutils
Diffstat (limited to 'lib/libc/arch')
-rw-r--r-- | lib/libc/arch/hppa/string/bcopy.m4 | 3 | ||||
-rw-r--r-- | lib/libc/arch/hppa/string/strlcpy.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/Ovfork.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/brk.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/exect.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/fork.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sbrk.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigpending.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigprocmask.S | 16 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigreturn.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigsuspend.S | 5 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/syscall.S | 5 |
12 files changed, 42 insertions, 27 deletions
diff --git a/lib/libc/arch/hppa/string/bcopy.m4 b/lib/libc/arch/hppa/string/bcopy.m4 index dca65ee1b48..ba56db044d8 100644 --- a/lib/libc/arch/hppa/string/bcopy.m4 +++ b/lib/libc/arch/hppa/string/bcopy.m4 @@ -1,4 +1,4 @@ -define(_rcsid,``$OpenBSD: bcopy.m4,v 1.2 1999/12/05 02:37:36 mickey Exp $'')dnl +define(_rcsid,``$OpenBSD: bcopy.m4,v 1.3 2000/01/12 00:08:41 mickey Exp $'')dnl dnl dnl dnl This is the source file for bcopy.S, spcopy.S @@ -202,6 +202,7 @@ ifelse(NAME, `bcopy', #if defined(LIBC_SCCS) .text .asciz "versionmacro" + .align 4 #endif ENTRY(memcpy) diff --git a/lib/libc/arch/hppa/string/strlcpy.S b/lib/libc/arch/hppa/string/strlcpy.S index 3faaaacdaa3..6ffa8a21a15 100644 --- a/lib/libc/arch/hppa/string/strlcpy.S +++ b/lib/libc/arch/hppa/string/strlcpy.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcpy.S,v 1.1 1999/04/27 17:53:32 mickey Exp $ */ +/* $OpenBSD: strlcpy.S,v 1.2 2000/01/12 00:08:41 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -34,7 +34,8 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: strlcpy.S,v 1.1 1999/04/27 17:53:32 mickey Exp $" + .asciz "$OpenBSD: strlcpy.S,v 1.2 2000/01/12 00:08:41 mickey Exp $" + .align 4 #endif /* size_t strlcpy(char *dst, const char *src, size_t siz) diff --git a/lib/libc/arch/hppa/sys/Ovfork.S b/lib/libc/arch/hppa/sys/Ovfork.S index 6a8fbbff1f7..92a0a3b8c45 100644 --- a/lib/libc/arch/hppa/sys/Ovfork.S +++ b/lib/libc/arch/hppa/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.4 2000/01/12 00:08:41 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: Ovfork.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: Ovfork.S,v 1.4 2000/01/12 00:08:41 mickey Exp $" + .align 4 #endif ENTRY(vfork) diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S index 0e1b513bfdd..e7bb78a605a 100644 --- a/lib/libc/arch/hppa/sys/brk.S +++ b/lib/libc/arch/hppa/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: brk.S,v 1.4 2000/01/12 00:08:41 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: brk.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: brk.S,v 1.4 2000/01/12 00:08:41 mickey Exp $" + .align 4 #endif .import curbrk, data diff --git a/lib/libc/arch/hppa/sys/exect.S b/lib/libc/arch/hppa/sys/exect.S index e6cafe41d01..e68e09e50fd 100644 --- a/lib/libc/arch/hppa/sys/exect.S +++ b/lib/libc/arch/hppa/sys/exect.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exect.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: exect.S,v 1.4 2000/01/12 00:08:41 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: exect.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: exect.S,v 1.4 2000/01/12 00:08:41 mickey Exp $" + .align 4 #endif /* we do no tracing yet */ diff --git a/lib/libc/arch/hppa/sys/fork.S b/lib/libc/arch/hppa/sys/fork.S index 22bebccf8fb..43e42b58d90 100644 --- a/lib/libc/arch/hppa/sys/fork.S +++ b/lib/libc/arch/hppa/sys/fork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fork.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: fork.S,v 1.4 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: fork.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: fork.S,v 1.4 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif ENTRY(fork) diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S index d33bdb048c2..832054f157e 100644 --- a/lib/libc/arch/hppa/sys/sbrk.S +++ b/lib/libc/arch/hppa/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: sbrk.S,v 1.4 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: sbrk.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.4 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif .import end, data diff --git a/lib/libc/arch/hppa/sys/sigpending.S b/lib/libc/arch/hppa/sys/sigpending.S index a94ec62a039..dc41547ab54 100644 --- a/lib/libc/arch/hppa/sys/sigpending.S +++ b/lib/libc/arch/hppa/sys/sigpending.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigpending.S,v 1.3 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: sigpending.S,v 1.4 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: sigpending.S,v 1.3 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: sigpending.S,v 1.4 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif ENTRY(sigpending) diff --git a/lib/libc/arch/hppa/sys/sigprocmask.S b/lib/libc/arch/hppa/sys/sigprocmask.S index f0bfbb4ff1c..659981a3130 100644 --- a/lib/libc/arch/hppa/sys/sigprocmask.S +++ b/lib/libc/arch/hppa/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.4 1999/12/31 04:36:35 mickey Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.5 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,10 +36,14 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: sigprocmask.S,v 1.4 1999/12/31 04:36:35 mickey Exp $" + .asciz "$OpenBSD: sigprocmask.S,v 1.5 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif ENTRY(sigprocmask) + /* just in case compiler forgot about this */ + stw arg2, HPPA_FRAME_ARG(2)(sp) + comb,<>,n r0, arg1, sigprocmask$nblock b sigprocmask$call @@ -52,15 +56,15 @@ sigprocmask$nblock sigprocmask$call SYSCALL(sigprocmask) - comb,<>,n r0, t1, sigprocmask$err + add,= r0, t1, t1 + bv,n r0(rp) + nop ldw HPPA_FRAME_ARG(2)(sp), arg2 add,= r0, arg2, arg2 stw ret0, 0(arg2) - -sigprocmask$err bv r0(rp) - nop + copy r0, ret0 EXIT(sigprocmask) .end diff --git a/lib/libc/arch/hppa/sys/sigreturn.S b/lib/libc/arch/hppa/sys/sigreturn.S index 84fcee16bc5..82443ceeab7 100644 --- a/lib/libc/arch/hppa/sys/sigreturn.S +++ b/lib/libc/arch/hppa/sys/sigreturn.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigreturn.S,v 1.2 1999/12/31 04:28:50 mickey Exp $ */ +/* $OpenBSD: sigreturn.S,v 1.3 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: sigreturn.S,v 1.2 1999/12/31 04:28:50 mickey Exp $" + .asciz "$OpenBSD: sigreturn.S,v 1.3 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif RSYSCALL(sigreturn) diff --git a/lib/libc/arch/hppa/sys/sigsuspend.S b/lib/libc/arch/hppa/sys/sigsuspend.S index 9b658293ce6..460dc3a64a8 100644 --- a/lib/libc/arch/hppa/sys/sigsuspend.S +++ b/lib/libc/arch/hppa/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.3 1999/12/31 04:28:51 mickey Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.4 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: sigsuspend.S,v 1.3 1999/12/31 04:28:51 mickey Exp $" + .asciz "$OpenBSD: sigsuspend.S,v 1.4 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif ENTRY(sigsuspend) diff --git a/lib/libc/arch/hppa/sys/syscall.S b/lib/libc/arch/hppa/sys/syscall.S index a0d032d5d20..96faaf1307f 100644 --- a/lib/libc/arch/hppa/sys/syscall.S +++ b/lib/libc/arch/hppa/sys/syscall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.S,v 1.2 1999/12/31 04:28:51 mickey Exp $ */ +/* $OpenBSD: syscall.S,v 1.3 2000/01/12 00:08:42 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,8 @@ #ifdef SYSLIBC_SCCS .space .text .subspa $code$ - .asciz "$OpenBSD: syscall.S,v 1.2 1999/12/31 04:28:51 mickey Exp $" + .asciz "$OpenBSD: syscall.S,v 1.3 2000/01/12 00:08:42 mickey Exp $" + .align 4 #endif RSYSCALL(syscall) |