summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/arch/aarch64/SYS.h8
-rw-r--r--lib/libc/arch/aarch64/sys/brk.S6
-rw-r--r--lib/libc/arch/aarch64/sys/sbrk.S6
-rw-r--r--lib/libc/arch/arm/SYS.h8
-rw-r--r--lib/libc/arch/arm/sys/brk.S8
-rw-r--r--lib/libc/arch/arm/sys/sbrk.S8
-rw-r--r--lib/libc/arch/mips64/sys/brk.S4
-rw-r--r--lib/libc/arch/mips64/sys/sbrk.S4
-rw-r--r--lib/libc/arch/mips64/sys/tfork_thread.S4
-rw-r--r--lib/libc/arch/powerpc/sys/brk.S10
-rw-r--r--lib/libc/arch/powerpc/sys/sbrk.S4
-rw-r--r--lib/libc/arch/sparc64/string/ffs.S8
-rw-r--r--lib/libc/arch/sparc64/sys/brk.S6
-rw-r--r--lib/libc/arch/sparc64/sys/sbrk.S6
14 files changed, 45 insertions, 45 deletions
diff --git a/lib/libc/arch/aarch64/SYS.h b/lib/libc/arch/aarch64/SYS.h
index 0c5fd4572a3..8eb2463d45a 100644
--- a/lib/libc/arch/aarch64/SYS.h
+++ b/lib/libc/arch/aarch64/SYS.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: SYS.h,v 1.5 2020/02/18 12:19:11 kettenis Exp $ */
+/* $OpenBSD: SYS.h,v 1.6 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $ */
/*-
@@ -39,8 +39,8 @@
#include <sys/syscall.h>
#define SYSENTRY(x) \
- .weak _C_LABEL(x); \
- _C_LABEL(x) = _C_LABEL(_thread_sys_ ## x); \
+ .weak x; \
+ x = _thread_sys_ ## x; \
ENTRY(_thread_sys_ ## x)
#define SYSENTRY_HIDDEN(x) \
ENTRY(_thread_sys_ ## x)
@@ -57,7 +57,7 @@
dsb nsh; \
isb
-#define CERROR _C_LABEL(__cerror)
+#define CERROR __cerror
#define _SYSCALL_NOERROR(x,y) \
SYSENTRY(x); \
diff --git a/lib/libc/arch/aarch64/sys/brk.S b/lib/libc/arch/aarch64/sys/brk.S
index a18c1fc60ff..45754fd473e 100644
--- a/lib/libc/arch/aarch64/sys/brk.S
+++ b/lib/libc/arch/aarch64/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.6 2022/05/24 22:34:02 guenther Exp $ */
+/* $OpenBSD: brk.S,v 1.7 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */
/*-
@@ -34,14 +34,14 @@
#include "SYS.h"
- .globl _C_LABEL(_end)
+ .globl _end
.globl __curbrk
.data
.align 3
.type __minbrk,#object
__minbrk:
- .quad _C_LABEL(_end)
+ .quad _end
END(__minbrk)
/*
diff --git a/lib/libc/arch/aarch64/sys/sbrk.S b/lib/libc/arch/aarch64/sys/sbrk.S
index e1ffccd4360..9e5eca655d6 100644
--- a/lib/libc/arch/aarch64/sys/sbrk.S
+++ b/lib/libc/arch/aarch64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.5 2022/05/24 22:34:02 guenther Exp $ */
+/* $OpenBSD: sbrk.S,v 1.6 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */
/*-
@@ -34,7 +34,7 @@
#include "SYS.h"
- .globl _C_LABEL(_end)
+ .globl _end
.data
.align 3
@@ -42,7 +42,7 @@
.type __curbrk,#object
.hidden __curbrk
__curbrk:
- .quad _C_LABEL(_end)
+ .quad _end
END(__curbrk)
/*
diff --git a/lib/libc/arch/arm/SYS.h b/lib/libc/arch/arm/SYS.h
index 5d12784c3ec..037ded4050a 100644
--- a/lib/libc/arch/arm/SYS.h
+++ b/lib/libc/arch/arm/SYS.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: SYS.h,v 1.18 2020/03/13 09:31:24 deraadt Exp $ */
+/* $OpenBSD: SYS.h,v 1.19 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $ */
/*-
@@ -40,8 +40,8 @@
#define SYSENTRY(x) \
- .weak _C_LABEL(x); \
- _C_LABEL(x) = _C_LABEL(_thread_sys_ ## x); \
+ .weak x; \
+ x = _thread_sys_ ## x; \
ENTRY(_thread_sys_ ## x)
#define SYSENTRY_HIDDEN(x) \
ENTRY(_thread_sys_ ## x)
@@ -58,7 +58,7 @@
dsb nsh; \
isb
-#define CERROR _C_LABEL(__cerror)
+#define CERROR __cerror
#define _SYSCALL_NOERROR(x,y) \
SYSENTRY(x); \
diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S
index 038f6dbc389..50bb6f6a0af 100644
--- a/lib/libc/arch/arm/sys/brk.S
+++ b/lib/libc/arch/arm/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.12 2022/05/24 17:15:23 guenther Exp $ */
+/* $OpenBSD: brk.S,v 1.13 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */
/*-
@@ -34,14 +34,14 @@
#include "SYS.h"
- .globl _C_LABEL(_end)
+ .globl _end
.globl __curbrk
.data
.align 2
.type __minbrk,#object
__minbrk:
- .word _C_LABEL(_end)
+ .word _end
END(__minbrk)
/*
@@ -87,7 +87,7 @@ ENTRY_NB(brk)
.align 2
#ifdef __PIC__
.Lgot:
- .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8)
+ .word _GLOBAL_OFFSET_TABLE_ - (.L1+8)
#endif
.Lminbrk:
.word PIC_SYM(__minbrk, GOT)
diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S
index dc840fb9454..a49ac537da1 100644
--- a/lib/libc/arch/arm/sys/sbrk.S
+++ b/lib/libc/arch/arm/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.12 2022/05/24 17:15:23 guenther Exp $ */
+/* $OpenBSD: sbrk.S,v 1.13 2022/12/08 01:25:43 guenther Exp $ */
/* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */
/*-
@@ -34,7 +34,7 @@
#include "SYS.h"
- .globl _C_LABEL(_end)
+ .globl _end
.data
.align 2
@@ -42,7 +42,7 @@
.type __curbrk,#object
.hidden __curbrk
__curbrk:
- .word _C_LABEL(_end)
+ .word _end
END(__curbrk)
/*
@@ -79,7 +79,7 @@ ENTRY_NB(sbrk)
.align 2
#ifdef __PIC__
.Lgot:
- .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8)
+ .word _GLOBAL_OFFSET_TABLE_ - (.L1+8)
#endif
.Lcurbrk:
.word PIC_SYM(__curbrk, GOT)
diff --git a/lib/libc/arch/mips64/sys/brk.S b/lib/libc/arch/mips64/sys/brk.S
index ada3b7304e6..f1996672af8 100644
--- a/lib/libc/arch/mips64/sys/brk.S
+++ b/lib/libc/arch/mips64/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.9 2021/11/27 15:12:19 visa Exp $ */
+/* $OpenBSD: brk.S,v 1.10 2022/12/08 01:25:43 guenther Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.data
__minbrk:
- PTR_VAL _C_LABEL(_end)
+ PTR_VAL _end
.size __minbrk, . - __minbrk
.type __minbrk,@object
.text
diff --git a/lib/libc/arch/mips64/sys/sbrk.S b/lib/libc/arch/mips64/sys/sbrk.S
index 87b9563a72f..1647b613608 100644
--- a/lib/libc/arch/mips64/sys/sbrk.S
+++ b/lib/libc/arch/mips64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.9 2021/11/27 15:12:19 visa Exp $ */
+/* $OpenBSD: sbrk.S,v 1.10 2022/12/08 01:25:43 guenther Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.hidden __curbrk
.data
-__curbrk: PTR_VAL _C_LABEL(_end)
+__curbrk: PTR_VAL _end
.size __curbrk, . - __curbrk
.type __curbrk,@object
.text
diff --git a/lib/libc/arch/mips64/sys/tfork_thread.S b/lib/libc/arch/mips64/sys/tfork_thread.S
index 14ef3a38b0a..19a1e86df2f 100644
--- a/lib/libc/arch/mips64/sys/tfork_thread.S
+++ b/lib/libc/arch/mips64/sys/tfork_thread.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: tfork_thread.S,v 1.4 2020/10/20 15:26:59 visa Exp $ */
+/* $OpenBSD: tfork_thread.S,v 1.5 2022/12/08 01:25:43 guenther Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -35,7 +35,7 @@ GPOFF=FRAMESZ-2*REGSZ
LEAF(__tfork_thread, FRAMESZ)
/* a0 = param, a1 = psize, a2 = func, a3 = arg */
PTR_SUBU sp, FRAMESZ
- SETUP_GP64(GPOFF, _C_LABEL(__tfork_thread))
+ SETUP_GP64(GPOFF, __tfork_thread)
.set reorder
move t1, a3 /* arg */
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S
index dbd1c0c7961..9e117ffda67 100644
--- a/lib/libc/arch/powerpc/sys/brk.S
+++ b/lib/libc/arch/powerpc/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.17 2022/06/10 01:56:02 guenther Exp $ */
+/* $OpenBSD: brk.S,v 1.18 2022/12/08 01:25:43 guenther Exp $ */
/*
* Copyright (c) 1996 Dale Rahn
@@ -28,14 +28,14 @@
#include "SYS.h"
.extern __curbrk
- .extern _C_LABEL(_end)
+ .extern _end
ENTRY_NB(brk)
/* check >= _end, if not make the call for _end */
#ifndef __PIC__
- addis 5,0,_C_LABEL(_end)@h
- ori 5,5,_C_LABEL(_end)@l /* # 5 = &_end */
+ addis 5,0,_end@h
+ ori 5,5,_end@l /* # 5 = &_end */
#else
mflr 10
bcl 20, 31, 1f
@@ -43,7 +43,7 @@ ENTRY_NB(brk)
addis 9, 9, _GLOBAL_OFFSET_TABLE_-1b@ha
addi 9, 9, _GLOBAL_OFFSET_TABLE_-1b@l
mtlr 10
- lwz 5,_C_LABEL(_end)@got(9)
+ lwz 5,_end@got(9)
#endif
cmplw 3,5
bge+ .L_brk_call
diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S
index ea26f1ea2c4..b554245d037 100644
--- a/lib/libc/arch/powerpc/sys/sbrk.S
+++ b/lib/libc/arch/powerpc/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.16 2022/06/10 01:56:02 guenther Exp $ */
+/* $OpenBSD: sbrk.S,v 1.17 2022/12/08 01:25:43 guenther Exp $ */
/*
* Copyright (c) 1996 Dale Rahn
@@ -32,7 +32,7 @@
.globl __curbrk
.hidden __curbrk
__curbrk:
- .long _C_LABEL(_end)
+ .long _end
END(__curbrk)
.type __curbrk,@object
diff --git a/lib/libc/arch/sparc64/string/ffs.S b/lib/libc/arch/sparc64/string/ffs.S
index 2f1aa6fa72d..7552c407b45 100644
--- a/lib/libc/arch/sparc64/string/ffs.S
+++ b/lib/libc/arch/sparc64/string/ffs.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs.S,v 1.8 2018/01/18 23:42:13 deraadt Exp $ */
+/* $OpenBSD: ffs.S,v 1.9 2022/12/08 01:25:43 guenther Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,9 +50,9 @@
*/
ENTRY(ffs)
#ifdef __PIC__
- PICCY_SET(_C_LABEL(__ffstab), %o2, %o3)
+ PICCY_SET(__ffstab, %o2, %o3)
#else
- set _C_LABEL(__ffstab), %o2
+ set __ffstab, %o2
#endif
andcc %o0, 0xff, %o1 ! get low byte
be,a 1f ! try again if 0
@@ -86,7 +86,7 @@ ENTRY(ffs)
END(ffs)
.protected ffs
-_C_LABEL(__ffstab):
+__ffstab:
.byte -24,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1 /* 00-0f */
.byte 5,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1 /* 10-1f */
.byte 6,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1 /* 20-2f */
diff --git a/lib/libc/arch/sparc64/sys/brk.S b/lib/libc/arch/sparc64/sys/brk.S
index 653c693ac21..337ab251699 100644
--- a/lib/libc/arch/sparc64/sys/brk.S
+++ b/lib/libc/arch/sparc64/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.9 2022/01/01 23:47:14 guenther Exp $ */
+/* $OpenBSD: brk.S,v 1.10 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: brk.S,v 1.9 2000/07/25 20:15:40 mycroft Exp $ */
/*
@@ -39,12 +39,12 @@
#include "SYS.h"
.globl __curbrk
- .globl _C_LABEL(_end)
+ .globl _end
.data
.align 8
__minbrk:
- .xword _C_LABEL(_end) /* lower brk limit; also for gmon code */
+ .xword _end /* lower brk limit; also for gmon code */
END(__minbrk)
OTYPE(__minbrk)
.text
diff --git a/lib/libc/arch/sparc64/sys/sbrk.S b/lib/libc/arch/sparc64/sys/sbrk.S
index cdbde5ac243..5daf57093df 100644
--- a/lib/libc/arch/sparc64/sys/sbrk.S
+++ b/lib/libc/arch/sparc64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.7 2022/01/01 23:47:14 guenther Exp $ */
+/* $OpenBSD: sbrk.S,v 1.8 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: sbrk.S,v 1.7 2000/07/25 15:14:46 mycroft Exp $ */
/*
@@ -40,12 +40,12 @@
.globl __curbrk
.hidden __curbrk
- .globl _C_LABEL(_end)
+ .globl _end
.data
.align 8
__curbrk:
- .xword _C_LABEL(_end)
+ .xword _end
END(__curbrk)
OTYPE(__curbrk)
.text
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 01:21:15 +0000