svn commit: r346484 - stable/12/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Sun Apr 21 09:11:22 2019
New Revision: 346484
URL: https://svnweb.freebsd.org/changeset/base/346484

Log:
  MFC r346216:
  ld-elf.so: make LD_DEBUG always functional.

Modified:
  stable/12/libexec/rtld-elf/Makefile
  stable/12/libexec/rtld-elf/debug.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rtld-elf/Makefile
==============================================================================
--- stable/12/libexec/rtld-elf/Makefile	Sun Apr 21 04:35:49 2019	(r346483)
+++ stable/12/libexec/rtld-elf/Makefile	Sun Apr 21 09:11:22 2019	(r346484)
@@ -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

Modified: stable/12/libexec/rtld-elf/debug.h
==============================================================================
--- stable/12/libexec/rtld-elf/debug.h	Sun Apr 21 04:35:49 2019	(r346483)
+++ stable/12/libexec/rtld-elf/debug.h	Sun Apr 21 09:11:22 2019	(r346484)
@@ -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)