PERFORCE change 157180 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=157180

Change 157180 by rwatson at rwatson_freebsd_capabilities on 2009/02/04 23:28:33

	As we will include CSU in each sandbox binary, there's no need to
	expose rtld's copies of __progname and environ symbols to run-time
	linked objects.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#12 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#2 delete
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#11 $
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#12 $
 
 WITHOUT_SSP=
 
@@ -21,7 +21,6 @@
 
 CFLAGS+=	-fpic -DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
-
 DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic
 
@@ -29,7 +28,7 @@
 .if ${MK_SYMVER} == "yes"
 LIBCDIR=	${.CURDIR}/../../lib/libc
 VERSION_DEF=	${LIBCDIR}/Versions.def
-SYMBOL_MAPS=	${.CURDIR}/../rtld-elf/Symbol.map ${.CURDIR}/Symbol.map
+SYMBOL_MAPS=	${.CURDIR}/../rtld-elf/Symbol.map
 VERSION_MAP=	Version.map
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#8 (text+ko) ====

@@ -184,13 +184,6 @@
 #endif
 
 /*
- * Global declarations normally provided by crt1.  The dynamic linker is
- * not built with crt1, so we have to provide them ourselves.
- */
-char *__progname;
-char **environ;
-
-/*
  * These are the functions the dynamic linker exports to application
  * programs.  They are the only symbols the dynamic linker is willing
  * to export from itself.
@@ -215,14 +208,17 @@
     (func_ptr_type) &dl_iterate_phdr,
     (func_ptr_type) &_rtld_atfork_pre,
     (func_ptr_type) &_rtld_atfork_post,
-#ifdef IN_RTLD_CAP
-    (func_ptr_type) &environ,
-    (func_ptr_type) &__progname,
-#endif
     NULL
 };
 
 /*
+ * Global declarations normally provided by crt1.  The dynamic linker is
+ * not built with crt1, so we have to provide them ourselves.
+ */
+char *__progname;
+char **environ;
+
+/*
  * Globals to control TLS allocation.
  */
 size_t tls_last_offset;		/* Static TLS offset of last module */