From owner-p4-projects@FreeBSD.ORG Wed Feb 4 23:28:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0D271065675; Wed, 4 Feb 2009 23:28:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 811E61065672 for ; Wed, 4 Feb 2009 23:28:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5328F8FC1C for ; Wed, 4 Feb 2009 23:28:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n14NShnB022340 for ; Wed, 4 Feb 2009 23:28:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n14NShgt022338 for perforce@freebsd.org; Wed, 4 Feb 2009 23:28:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Feb 2009 23:28:43 GMT Message-Id: <200902042328.n14NShgt022338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 157180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2009 23:28:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=157180 Change 157180 by rwatson@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 */