From 59f9830997c7e0e571ceb72e4cd85155d5f62fb7 Mon Sep 17 00:00:00 2001 From: fvdl Date: Mon, 10 Feb 2003 11:09:33 +0000 Subject: [PATCH] Continue at the plain switch return point in pthread__switch, not the locked one, in the !PIC case. From Tor Egge via Havard Eidnes. --- lib/libpthread/arch/i386/pthread_switch.S | 4 ++-- lib/libpthread/arch/x86_64/pthread_switch.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libpthread/arch/i386/pthread_switch.S b/lib/libpthread/arch/i386/pthread_switch.S index 8dcc53848378..731377ac874d 100644 --- a/lib/libpthread/arch/i386/pthread_switch.S +++ b/lib/libpthread/arch/i386/pthread_switch.S @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_switch.S,v 1.2 2003/01/18 10:34:18 thorpej Exp $ */ +/* $NetBSD: pthread_switch.S,v 1.3 2003/02/10 11:09:33 fvdl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -141,7 +141,7 @@ ENTRY(pthread__switch) #ifdef PIC movl PIC_GOT(switch_return_point), %esi #else - leal locked_return_point, %esi + leal switch_return_point, %esi #endif movl %esi, UC_EIP(%edi) diff --git a/lib/libpthread/arch/x86_64/pthread_switch.S b/lib/libpthread/arch/x86_64/pthread_switch.S index 3d3a0501f29d..eb1cc8193742 100644 --- a/lib/libpthread/arch/x86_64/pthread_switch.S +++ b/lib/libpthread/arch/x86_64/pthread_switch.S @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_switch.S,v 1.1 2003/01/30 02:10:32 fvdl Exp $ */ +/* $NetBSD: pthread_switch.S,v 1.2 2003/02/10 11:09:34 fvdl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -138,7 +138,7 @@ ENTRY(pthread__switch) #ifdef PIC movq PIC_GOT(switch_return_point), %r11 #else - leaq locked_return_point, %r11 + leaq switch_return_point, %r11 #endif movq %r11, UC_RIP(%r14)