From c20979d7f33ac2710ed74da74aa39f8c78c9f3a0 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Wed, 15 Aug 2012 17:07:50 +0000 Subject: Oops, on a.out architectures __cerror() is called _cerror(). Fix accordingly so vax can build again. ok deraadt --- lib/librthread/rthread.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index ccc42898524..704ed46d03d 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.63 2012/08/13 04:52:42 matthew Exp $ */ +/* $OpenBSD: rthread.c,v 1.64 2012/08/15 17:07:49 matthew Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst * All Rights Reserved. @@ -646,11 +646,17 @@ _rthread_bind_lock(int what) } #endif +#ifdef __ELF__ +#define CERROR_SYMBOL __cerror +#else +#define CERROR_SYMBOL _cerror +#endif + /* * XXX: Bogus type signature, but we only need to be able to emit a * reference to it below. */ -extern void __cerror(void); +extern void CERROR_SYMBOL(void); /* * All weak references used within libc that are redefined in libpthread @@ -658,7 +664,7 @@ extern void __cerror(void); * be used when linking -static. */ static void *__libc_overrides[] __used = { - &__cerror, + &CERROR_SYMBOL, &__errno, &_thread_arc4_lock, &_thread_arc4_unlock, -- cgit v1.2.3