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

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

ok gkoehler@

diff --git a/lib/libc/arch/powerpc64/SYS.h b/lib/libc/arch/powerpc64/SYS.h
index 7ab8622..9964c48 100644 (file)
--- a/lib/libc/arch/powerpc64/SYS.h
+++ b/lib/libc/arch/powerpc64/SYS.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: SYS.h,v 1.4 2020/10/16 23:42:14 deraadt Exp $ */
+/*     $OpenBSD: SYS.h,v 1.5 2022/12/07 23:25:59 guenther Exp $        */
 /*-
  * Copyright (c) 1994
  *     Andrew Cagney.  All rights reserved.
@@ -54,8 +54,8 @@
 /* offset of errno from %r13 */
 #define R13_OFFSET_ERRNO               (-TCB_OFFSET + TCB_OFFSET_ERRNO)
 
-#define SYSENTRY(x)            .weak _C_LABEL(x); \
-                               _C_LABEL(x) = _C_LABEL(_thread_sys_ ## x); \
+#define SYSENTRY(x)            .weak x; \
+                               x = _thread_sys_ ## x; \
                                ENTRY(_thread_sys_ ## x)
 #define SYSENTRY_HIDDEN(x)     ENTRY(_thread_sys_ ## x)
 #define __END_HIDDEN(p,x)      END(p##x);                      \

diff --git a/lib/libc/arch/powerpc64/sys/brk.S b/lib/libc/arch/powerpc64/sys/brk.S
index 9875e95..a101010 100644 (file)
--- a/lib/libc/arch/powerpc64/sys/brk.S
+++ b/lib/libc/arch/powerpc64/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.4 2020/10/16 23:42:16 deraadt Exp $ */
+/* $OpenBSD: brk.S,v 1.5 2022/12/07 23:25:59 guenther Exp $ */
 
 /*
  * Copyright (c) 1996 Dale Rahn
@@ -28,7 +28,7 @@
 #include "SYS.h"
 
        .extern __curbrk
-       .extern _C_LABEL(_end)
+       .extern _end
 
        .weak   brk
 

diff --git a/sys/arch/powerpc64/include/asm.h b/sys/arch/powerpc64/include/asm.h
index 8b9b6e4..aef1cbb 100644 (file)
--- a/sys/arch/powerpc64/include/asm.h
+++ b/sys/arch/powerpc64/include/asm.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: asm.h,v 1.6 2020/10/22 23:35:43 mortimer Exp $        */
+/*     $OpenBSD: asm.h,v 1.7 2022/12/07 23:25:59 guenther Exp $        */
 
 /*
  * Copyright (c) 2020 Dale Rahn <drahn@openbsd.org>
@@ -32,7 +32,7 @@
        addis   %r2, %r12, .TOC.-_GEP_LABEL(x)@ha;              \
        addi    %r2, %r2, .TOC.-_GEP_LABEL(x)@l;                \
        _LEP_LABEL(x):                                          \
-       .localentry     _C_LABEL(x), _LEP_LABEL(x)-_GEP_LABEL(x);
+       .localentry     x, _LEP_LABEL(x)-_GEP_LABEL(x);
 
 #if defined(PROF) || defined(GPROF)
 # define _PROF_PROLOGUE(y)                                     \
@@ -50,8 +50,8 @@ _TMP_LABEL(y):;                                                       \
 # define _PROF_PROLOGUE(y)
 #endif
 
-#define ENTRY(y)       _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE(y)
-#define ASENTRY(y)     _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE(y)
+#define ENTRY(y)       _ENTRY(y); _PROF_PROLOGUE(y)
+#define ASENTRY(y)     _ENTRY(y); _PROF_PROLOGUE(y)
 #define END(y)         .size y, . - y
 
 #define STRONG_ALIAS(alias,sym) \