From 4ed140ec00bb91638680d78e505d3ecf18b7ea63 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 21 Apr 2019 09:11:22 +0000
Subject: [PATCH] MFC r346216: ld-elf.so: make LD_DEBUG always functional.

---
 libexec/rtld-elf/Makefile | 2 +-
 libexec/rtld-elf/debug.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 24f3ce34226..49a94713c31 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -2,7 +2,7 @@
 
 # Use the following command to build local debug version of dynamic
 # linker:
-# make DEBUG_FLAGS=-g DEBUG=-DDEBUG WITHOUT_TESTS=yes all
+# make DEBUG_FLAGS=-g WITHOUT_TESTS=yes all
 
 .include <src.opts.mk>
 PACKAGE=	clibs
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index c0528294f1d..1ad0323b42f 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -39,10 +39,10 @@
 #include <string.h>
 #include <unistd.h>
 
-extern void debug_printf(const char *, ...) __printflike(1, 2);
+void debug_printf(const char *, ...) __printflike(1, 2);
 extern int debug;
 
-#ifdef DEBUG
+#ifndef NO_LD_DEBUG
 #define dbg(...)	debug_printf(__VA_ARGS__)
 #else
 #define dbg(...)	((void) 0)
-- 
2.45.0