diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-08 02:11:28 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-08 02:11:28 +0000 |
| commit | d17472b7974485e2afcc4639e26e29c6ffe2cbdd (patch) | |
| tree | 3651e1e7939965e0ae3b8e62140f163ae5ab1dc5 /lib/libc | |
| parent | 99f092cb54970a4a2f138ab15c178ba402c6cb20 (diff) | |
_C_LABEL() and _ASM_LABEL() are no longer useful in the "everything
is ELF" world. Eliminate use of them in landisk code.
ok deraadt@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/sh/gen/setjmp.S | 6 | ||||
| -rw-r--r-- | lib/libc/arch/sh/gen/sigsetjmp.S | 6 | ||||
| -rw-r--r-- | lib/libc/arch/sh/sys/brk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/sh/sys/sbrk.S | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/libc/arch/sh/gen/setjmp.S b/lib/libc/arch/sh/gen/setjmp.S index e6832d0f096..60e1ac94bbb 100644 --- a/lib/libc/arch/sh/gen/setjmp.S +++ b/lib/libc/arch/sh/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.3 2015/10/31 11:39:35 miod Exp $ */ +/* $OpenBSD: setjmp.S,v 1.4 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: setjmp.S,v 1.10 2006/01/05 19:21:37 uwe Exp $ */ /*- @@ -105,7 +105,7 @@ ENTRY(setjmp) .align 2 .L_got_1: PIC_GOT_DATUM -.L_sigprocmask_1: CALL_DATUM(_C_LABEL(_HIDDEN(sigprocmask)), 1b) +.L_sigprocmask_1: CALL_DATUM(_HIDDEN(sigprocmask), 1b) SET_ENTRY_SIZE(setjmp) ENTRY(longjmp) @@ -164,5 +164,5 @@ ENTRY(longjmp) .align 2 .L_got_2: PIC_GOT_DATUM -.L_sigprocmask_2: CALL_DATUM(_C_LABEL(_HIDDEN(sigprocmask)), 1b) +.L_sigprocmask_2: CALL_DATUM(_HIDDEN(sigprocmask), 1b) SET_ENTRY_SIZE(longjmp) diff --git a/lib/libc/arch/sh/gen/sigsetjmp.S b/lib/libc/arch/sh/gen/sigsetjmp.S index 4ef71434ea7..55347037196 100644 --- a/lib/libc/arch/sh/gen/sigsetjmp.S +++ b/lib/libc/arch/sh/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.3 2015/10/31 11:39:35 miod Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.4 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: sigsetjmp.S,v 1.9 2006/01/05 19:21:37 uwe Exp $ */ /*- @@ -100,7 +100,7 @@ ENTRY(sigsetjmp) .align 2 .L_got_1: PIC_GOT_DATUM -.L_sigprocmask_1: CALL_DATUM(_C_LABEL(_HIDDEN(sigprocmask)), 1b) +.L_sigprocmask_1: CALL_DATUM(_HIDDEN(sigprocmask), 1b) SET_ENTRY_SIZE(sigsetjmp) ENTRY(siglongjmp) @@ -163,5 +163,5 @@ ENTRY(siglongjmp) .align 2 .L_got_2: PIC_GOT_DATUM -.L_sigprocmask_2: CALL_DATUM(_C_LABEL(_HIDDEN(sigprocmask)), 1b) +.L_sigprocmask_2: CALL_DATUM(_HIDDEN(sigprocmask), 1b) SET_ENTRY_SIZE(siglongjmp) diff --git a/lib/libc/arch/sh/sys/brk.S b/lib/libc/arch/sh/sys/brk.S index 4b854a31db5..0ecee462ce5 100644 --- a/lib/libc/arch/sh/sys/brk.S +++ b/lib/libc/arch/sh/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.7 2022/09/02 06:19:04 miod Exp $ */ +/* $OpenBSD: brk.S,v 1.8 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: brk.S,v 1.10 2006/01/06 03:58:31 uwe Exp $ */ /*- @@ -42,7 +42,7 @@ .data .align 2 __minbrk: - .long _C_LABEL(_end) + .long _end .size __minbrk, . - __minbrk .type __minbrk,@object diff --git a/lib/libc/arch/sh/sys/sbrk.S b/lib/libc/arch/sh/sys/sbrk.S index 3e569319700..0f11b4c3d8f 100644 --- a/lib/libc/arch/sh/sys/sbrk.S +++ b/lib/libc/arch/sh/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.7 2022/09/02 06:19:04 miod Exp $ */ +/* $OpenBSD: sbrk.S,v 1.8 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: sbrk.S,v 1.9 2006/01/06 03:58:31 uwe Exp $ */ /*- @@ -37,7 +37,7 @@ #include "SYS.h" - .globl _C_LABEL(_end) + .globl _end .globl __curbrk .hidden __curbrk @@ -45,7 +45,7 @@ .data __curbrk: - .long _C_LABEL(_end) + .long _end .size __curbrk, . - __curbrk .type __curbrk,@object |