[src/trunk]: src/libexec/ld.elf_so Protect certain definitions from view by c...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11279ae524b6
branches:  trunk
changeset: 474403:11279ae524b6
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 05 17:55:34 1999 +0000

description:
Protect certain definitions from view by crt0, by wrapping them in
#ifdef _RTLD_SOURCE.

Should fix the "variable page size" build error of crt0 on the SPARC.

diffstat:

 libexec/ld.elf_so/Makefile |   3 ++-
 libexec/ld.elf_so/rtld.h   |  12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r d8f174c5aadc -r 11279ae524b6 libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Mon Jul 05 15:54:18 1999 +0000
+++ b/libexec/ld.elf_so/Makefile        Mon Jul 05 17:55:34 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 1999/05/07 22:04:27 thorpej Exp $
+#      $NetBSD: Makefile,v 1.30 1999/07/05 17:55:34 thorpej Exp $
 
 .include <bsd.own.mk>                  # for OBJECT_FMT definition
 
@@ -30,6 +30,7 @@
 CPPFLAGS+= -Wall -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
 CPPFLAGS+= -I${.CURDIR}
 CPPFLAGS+= -DDEBUG -DRTLD_LOADER
+CPPFLAGS+= -D_RTLD_SOURCE
 #CPPFLAGS+= -DRTLD_DEBUG -DRTLD_DEBUG_RELOC
 
 LDADD+=        -L${DESTDIR}/${LIBDIR} -L${CLIBOBJ} -non_shared -lc_pic
diff -r d8f174c5aadc -r 11279ae524b6 libexec/ld.elf_so/rtld.h
--- a/libexec/ld.elf_so/rtld.h  Mon Jul 05 15:54:18 1999 +0000
+++ b/libexec/ld.elf_so/rtld.h  Mon Jul 05 17:55:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.h,v 1.13 1999/06/22 16:28:22 christos Exp $        */
+/*     $NetBSD: rtld.h,v 1.14 1999/07/05 17:55:34 thorpej Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -41,6 +41,8 @@
 #include "rtldenv.h"
 #include "link.h"
 
+#if defined(_RTLD_SOURCE)
+
 #define        RTLD_DEFAULT_LIBRARY_PATH       "/usr/lib"
 
 #if 0
@@ -73,6 +75,8 @@
 #define NEW(type)      ((type *) xmalloc(sizeof(type)))
 #define CNEW(type)     ((type *) xcalloc(sizeof(type)))
 
+#endif /* _RTLD_SOURCE */
+
 /*
  * C++ has mandated the use of the following keywords for its new boolean
  * type.  We might as well follow their lead.
@@ -175,6 +179,8 @@
        struct link_map linkmap;        /* for GDB */
 } Obj_Entry;
 
+#if defined(_RTLD_SOURCE)
+
 extern struct r_debug _rtld_debug;
 extern Obj_Entry *_rtld_objlist;
 extern Obj_Entry **_rtld_objtail;
@@ -244,4 +250,6 @@
 void _rtld_setup_powerpc_plt __P((const Obj_Entry *));
 #endif
 
-#endif
+#endif /* _RTLD_SOURCE */
+
+#endif /* RTLD_H */