From d12026722c5beef719ae2bf363d84b33c2beae75 Mon Sep 17 00:00:00 2001
From: Philip Guenther <guenther@cvs.openbsd.org>
Date: Sun, 26 Jul 2015 03:08:17 +0000
Subject: Copy relocations can't be jump-slot relocations, so delete the test
 for that.

ok miod@
---
 libexec/ld.so/sparc/rtld_machine.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libexec/ld.so/sparc')

diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c
index e743d7c8381..d3806a9dad6 100644
--- a/libexec/ld.so/sparc/rtld_machine.c
+++ b/libexec/ld.so/sparc/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.38 2014/04/16 10:52:59 guenther Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.39 2015/07/26 03:08:16 guenther Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -290,8 +290,7 @@ resolve_failed:
 			Elf_Addr soff;
 
 			soff = _dl_find_symbol(symn, &srcsym,
-			    SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|
-			    ((type == R_TYPE(JMP_SLOT)) ? SYM_PLT : SYM_NOTPLT),
+			    SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|SYM_NOTPLT,
 			    dstsym, object, NULL);
 			if (srcsym == NULL)
 				goto resolve_failed;
-- 
cgit v1.2.3