CVS commit: src/usr.bin/ldd/elf64

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Sun Jan 27 05:14:45 UTC 2019

Modified Files:
src/usr.bin/ldd/elf64: Makefile

Log Message:
Fix merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ldd/elf64/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.10 src/usr.bin/ldd/elf64/Makefile:1.11
--- src/usr.bin/ldd/elf64/Makefile:1.10	Sun Jan 27 02:08:51 2019
+++ src/usr.bin/ldd/elf64/Makefile	Sun Jan 27 05:14:45 2019
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2019/01/27 02:08:51 pgoyette Exp $
-
-NOSANITIZER=		# defined
+#	$NetBSD: Makefile,v 1.11 2019/01/27 05:14:45 kre Exp $
 
 NOSANITIZER=		# defined
 

CVS commit: src/usr.bin/ldd/elf64

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Aug 28 12:23:29 UTC 2014

Modified Files:
src/usr.bin/ldd/elf64: Makefile

Log Message:
Fix ldd on LP64 platforms by splitting the symbol versioning stuff for
elf64 as well.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/ldd/elf64/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.7 src/usr.bin/ldd/elf64/Makefile:1.8
--- src/usr.bin/ldd/elf64/Makefile:1.7	Sun Mar  2 03:55:19 2014
+++ src/usr.bin/ldd/elf64/Makefile	Thu Aug 28 12:23:29 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/02 03:55:19 matt Exp $
+#	$NetBSD: Makefile,v 1.8 2014/08/28 12:23:29 joerg Exp $
 
 .include bsd.own.mk
 
@@ -25,6 +25,8 @@ RTLD_FUNCS	= \
 	_rtld_map_object \
 	_rtld_obj_free \
 	_rtld_obj_new \
+	_rtld_object_add_name \
+	_rtld_object_match_name \
 	_rtld_add_paths \
 	_rtld_process_hints \
 	_rtld_sysctl \