Give internal 'botch' labels a '.L' prefix to remove them from the

symbol table

ok kettenis@ miod@

diff --git a/lib/libc/arch/aarch64/gen/_setjmp.S b/lib/libc/arch/aarch64/gen/_setjmp.S
index 9410a74..c646f80 100644 (file)
--- a/lib/libc/arch/aarch64/gen/_setjmp.S
+++ b/lib/libc/arch/aarch64/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: _setjmp.S,v 1.4 2020/10/19 08:47:28 kettenis Exp $    */
+/*     $OpenBSD: _setjmp.S,v 1.5 2022/05/24 22:35:27 guenther Exp $    */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * Copyright (c) 2014 The FreeBSD Foundation
@@ -74,7 +74,7 @@ ENTRY(_longjmp)
        ldr     x8, [x0], #8
        ldr     x9, .Lmagic
        cmp     x8, x9
-       b.ne    botch
+       b.ne    .Lbotch
 
        /* Restore the stack pointer */
        ldr     x8, [x0], #8
@@ -105,6 +105,6 @@ ENTRY(_longjmp)
        RETGUARD_CHECK(_longjmp, x15)
        ret
 
-botch:
+.Lbotch:
        bl      _HIDDEN(abort)
 END_STRONG(_longjmp)

diff --git a/lib/libc/arch/aarch64/gen/setjmp.S b/lib/libc/arch/aarch64/gen/setjmp.S
index c64e84f..3fa2282 100644 (file)
--- a/lib/libc/arch/aarch64/gen/setjmp.S
+++ b/lib/libc/arch/aarch64/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: setjmp.S,v 1.4 2020/10/19 08:47:28 kettenis Exp $     */
+/*     $OpenBSD: setjmp.S,v 1.5 2022/05/24 22:35:27 guenther Exp $     */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * Copyright (c) 2014 The FreeBSD Foundation
@@ -91,7 +91,7 @@ ENTRY(longjmp)
        ldr     x8, [x0], #8
        ldr     x9, .Lmagic
        cmp     x8, x9
-       b.ne    botch
+       b.ne    .Lbotch
 
        /* Restore the stack pointer */
        ldr     x8, [x0], #8
@@ -120,6 +120,6 @@ ENTRY(longjmp)
        RETGUARD_CHECK(longjmp, x15)
        ret
 
-botch:
+.Lbotch:
        bl      _HIDDEN(abort)
 END_STRONG(longjmp)