_C_LABEL() and _ASM_LABEL() are no longer useful in the "everything

is ELF" world.  Eliminate use of them in landisk code.

ok deraadt@

5 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/landisk/landisk/locore0.S b/sys/arch/landisk/landisk/locore0.S
index 29d710d648d..f651286669c 100644
--- a/sys/arch/landisk/landisk/locore0.S
+++ b/sys/arch/landisk/landisk/locore0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore0.S,v 1.1 2017/06/08 05:35:25 deraadt Exp $	*/
+/*	$OpenBSD: locore0.S,v 1.2 2022/12/08 02:11:27 guenther Exp $	*/
 /*	$NetBSD: locore.S,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -67,6 +67,6 @@ ALTENTRY(kernel_text)
 
 	/* NOTREACHED */	
 	.align	2
-_L.landisk_startup:	.long	_C_LABEL(landisk_startup)
-_L.bootstrap_stack:	.long	_C_LABEL(start)
+_L.landisk_startup:	.long	landisk_startup
+_L.bootstrap_stack:	.long	start
 _L.MMUCR:		.long	SH4_MMUCR
diff --git a/sys/arch/landisk/stand/boot/srt0.S b/sys/arch/landisk/stand/boot/srt0.S
index 8c3b42c05e3..678c0d1ec7c 100644
--- a/sys/arch/landisk/stand/boot/srt0.S
+++ b/sys/arch/landisk/stand/boot/srt0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: srt0.S,v 1.5 2022/09/02 10:15:35 miod Exp $	*/
+/*	$OpenBSD: srt0.S,v 1.6 2022/12/08 02:11:27 guenther Exp $	*/
 /*	$NetBSD: boot.S,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -148,7 +148,7 @@ ENTRY(cache_disable)
 .L.__bss_start:
 	.long   __bss_start
 .L.boot:
-	.long   _C_LABEL(boot)
+	.long	boot
 .L.start:
 	.long	0xc0000000
 .L.pwrctl:
diff --git a/sys/arch/landisk/stand/mbr/mbr.S b/sys/arch/landisk/stand/mbr/mbr.S
index 4e5d1b6b8c4..c2727aaa6ff 100644
--- a/sys/arch/landisk/stand/mbr/mbr.S
+++ b/sys/arch/landisk/stand/mbr/mbr.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.S,v 1.2 2022/05/24 17:29:02 krw Exp $	*/
+/*	$OpenBSD: mbr.S,v 1.3 2022/12/08 02:11:27 guenther Exp $	*/
 /*	$NetBSD: mbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $	*/
 
 /*-
@@ -159,7 +159,7 @@ boot_lba:
 
 
 	.align	1
-mbr_size:	.word	mbr_end - _C_LABEL(start)
+mbr_size:	.word	mbr_end - start
 	.align	1
 stack_offset:	.word	0x1000
 	.align	1
@@ -182,17 +182,17 @@ ERR_NOOS:	.asciz	"No O/S\r\n"
 
 
 /* space for mbr_dsn */
-	. = _C_LABEL(start) + 0x1b4
+	. = start + 0x1b4
 	.long	0
 
 /* mbr_bootsel_magic */
-	. = _C_LABEL(start) + 0x1b8
+	. = start + 0x1b8
 	.word	0
 
 /*
  * MBR partition table
  */
-	. = _C_LABEL(start) + 0x1be
+	. = start + 0x1be
 _pbr_part0:
 	.byte	0, 0, 0, 0, 0, 0, 0, 0	
 	.byte	0, 0, 0, 0, 0, 0, 0, 0
@@ -206,7 +206,7 @@ _pbr_part3:
 	.byte	0, 0, 0, 0, 0, 0, 0, 0
 	.byte	0, 0, 0, 0, 0, 0, 0, 0
 
-	. = _C_LABEL(start) + 0x1fe
+	. = start + 0x1fe
 magic:
 	.word	0xaa55
 mbr_end:
diff --git a/sys/arch/landisk/stand/xxboot/pbr.S b/sys/arch/landisk/stand/xxboot/pbr.S
index 8a101f3d9e6..476050148dc 100644
--- a/sys/arch/landisk/stand/xxboot/pbr.S
+++ b/sys/arch/landisk/stand/xxboot/pbr.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pbr.S,v 1.2 2022/08/24 17:35:15 miod Exp $	*/
+/*	$OpenBSD: pbr.S,v 1.3 2022/12/08 02:11:27 guenther Exp $	*/
 /*	$NetBSD: pbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $	*/
 
 /*-
@@ -40,9 +40,9 @@ ENTRY(start)
 	 .byte	0x11			/* 0x4f11: cmp/pz r15... */
 	.asciz	"OpenBSD"
 
-	. = _C_LABEL(start) + 0x0b	/* move to start of BPB */
+	. = start + 0x0b		/* move to start of BPB */
 
-	. = _C_LABEL(start) + 0x1c	/* skip BPB */
+	. = start + 0x1c		/* skip BPB */
 start0:
 	mova	pbr_end, r0
 	mov.w	pbr_size, r2
@@ -175,7 +175,7 @@ pbr_read_ok:
 
 
 	.align	1
-pbr_size:	.word	pbr_end - _C_LABEL(start)
+pbr_size:	.word	pbr_end - start
 	.align	1
 stack_offset:	.word	0x1000
 	.align	1
@@ -187,9 +187,9 @@ magic_offset:	.word	0x1fe
 .L.xxboot_magic1:
 	.long	0x20031125
 .L.xxboot_magic:
-	.long	_C_LABEL(xxboot_magic)
+	.long	xxboot_magic
 .L.xxboot_start:
-	.long	_C_LABEL(xxboot_start)
+	.long	xxboot_start
 
 	.align	2
 crlf:		.asciz	"\r\n"
@@ -202,11 +202,11 @@ ERR_NO_XXBOOT:	.asciz  "Not a xxboot image"
 ERR_PTN:	.asciz  "No OpenBSD partition"
 
 
-	. = _C_LABEL(start) + 0x1fe
+	. = start + 0x1fe
 magic:
 	.word	0xaa55
 pbr_end:
 
-	.global	_C_LABEL(ptn_disklabel)
-_C_LABEL(ptn_disklabel):
+	.global	ptn_disklabel
+ptn_disklabel:
 	.fill	512
diff --git a/sys/arch/landisk/stand/xxboot/xxboot.S b/sys/arch/landisk/stand/xxboot/xxboot.S
index c8c0e4cece5..a88209a90d1 100644
--- a/sys/arch/landisk/stand/xxboot/xxboot.S
+++ b/sys/arch/landisk/stand/xxboot/xxboot.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xxboot.S,v 1.1 2006/11/08 17:46:56 deraadt Exp $	*/
+/*	$OpenBSD: xxboot.S,v 1.2 2022/12/08 02:11:27 guenther Exp $	*/
 /*	$NetBSD: xxboot.S,v 1.1 2006/09/01 21:26:19 uwe Exp $	*/
 
 /*-
@@ -93,7 +93,7 @@ boot_fail:
 .L.__bss_start:
 	.long	__bss_start
 .L.boot1:
-	.long	_C_LABEL(boot1)
+	.long	boot1
 .L.2nd_loadaddr:
 	.long	LOADADDRESS
 .L.boot_params: