summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-05-12 04:22:02 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-05-12 04:22:02 +0000
commit54f498f2007a989d005eaf8a7658be6f52e60dde (patch)
tree6918caedfa035b7032f6f7800e56ae942f2f774c
parent53adc2690cb7981559f5daccc08787433bcad6a4 (diff)
Put the right number of leading underscores in ___cerror and __cerror, for
the sake of libpthread. Probably missed during the a.out->ELF switch, I can't believe this went unnoticed for so long.
-rw-r--r--lib/libc/arch/vax/sys/cerror.S5
-rw-r--r--lib/librthread/arch/vax/cerror.S5
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/libc/arch/vax/sys/cerror.S b/lib/libc/arch/vax/sys/cerror.S
index e838aec2b0c..d56f787afc1 100644
--- a/lib/libc/arch/vax/sys/cerror.S
+++ b/lib/libc/arch/vax/sys/cerror.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cerror.S,v 1.10 2013/07/05 21:10:50 miod Exp $ */
+/* $OpenBSD: cerror.S,v 1.11 2015/05/12 04:22:01 miod Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +33,8 @@
WEAK_ALIAS(__cerror,___cerror)
.globl _C_LABEL(errno)
-_C_LABEL(__cerror):
+ .globl _C_LABEL(___cerror)
+_C_LABEL(___cerror):
movl %r0,_C_LABEL(errno)
mnegl $1,%r0
mnegl $1,%r1
diff --git a/lib/librthread/arch/vax/cerror.S b/lib/librthread/arch/vax/cerror.S
index e860dadbf70..1414b029536 100644
--- a/lib/librthread/arch/vax/cerror.S
+++ b/lib/librthread/arch/vax/cerror.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cerror.S,v 1.2 2013/07/05 21:10:50 miod Exp $ */
+/* $OpenBSD: cerror.S,v 1.3 2015/05/12 04:22:01 miod Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +31,8 @@
#include "SYS.h"
.globl _C_LABEL(__errno)
-_C_LABEL(_cerror):
+ .globl _C_LABEL(__cerror)
+_C_LABEL(__cerror):
pushl %r0
calls $0, _C_LABEL(__errno)
movl (%sp)+, (%r0)