From owner-svn-src-all@FreeBSD.ORG Mon Dec 5 11:04:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A08011065673; Mon, 5 Dec 2011 11:04:39 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 3ADF08FC0A; Mon, 5 Dec 2011 11:04:38 +0000 (UTC) Received: from alf.home (alf.kiev.zoral.com.ua [10.1.1.177]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id pB5B4ZBE006113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Dec 2011 13:04:35 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from alf.home (kostik@localhost [127.0.0.1]) by alf.home (8.14.5/8.14.5) with ESMTP id pB5B4ZAk002152; Mon, 5 Dec 2011 13:04:35 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by alf.home (8.14.5/8.14.5/Submit) id pB5B4Zr8002151; Mon, 5 Dec 2011 13:04:35 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: alf.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 5 Dec 2011 13:04:35 +0200 From: Kostik Belousov To: Jilles Tjoelker Message-ID: <20111205110435.GP50300@deviant.kiev.zoral.com.ua> References: <201112050000.pB500mrQ008548@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jCr45KaQ2ES41j5N" Content-Disposition: inline In-Reply-To: <201112050000.pB500mrQ008548@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228269 - head/lib/libc/locale X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 11:04:39 -0000 --jCr45KaQ2ES41j5N Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 05, 2011 at 12:00:48AM +0000, Jilles Tjoelker wrote: > Author: jilles > Date: Mon Dec 5 00:00:47 2011 > New Revision: 228269 > URL: http://svn.freebsd.org/changeset/base/228269 >=20 > Log: > libc: Eliminate 13 relative relocations in wctype(). >=20 This reminds me the following change I had intended to do for quite some time. The hack for openssl is due to buggy assembler, which exactly the case I want to avoid for the base code. commit 3fdba61936a011b768845a8336ad2529e77e8ddb Author: Kostik Belousov Date: Mon Dec 5 13:01:48 2011 +0200 Fail the build when text relocations are generated for dso. diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 0a1704c..73f5cb7 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -7,6 +7,7 @@ SUBDIR=3D engines =20 LIB=3D crypto SHLIB_MAJOR=3D 6 +ALLOW_SHARED_TEXTREL=3D =20 NO_LINT=3D =20 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1e43921..40632de 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -167,6 +167,11 @@ SOBJS+=3D ${OBJS:.o=3D.So} .if defined(SHLIB_NAME) _LIBS+=3D ${SHLIB_NAME} =20 +SOLINKOPTS=3D -shared -Wl,-x -Wl,--fatal-warnings +.if !defined(ALLOW_SHARED_TEXTREL) +SOLINKOPTS+=3D -Wl,--warn-shared-textrel +.endif + .if target(beforelinking) ${SHLIB_NAME}: ${SOBJS} beforelinking .else @@ -178,11 +183,11 @@ ${SHLIB_NAME}: ${SOBJS} @ln -fs ${.TARGET} ${SHLIB_LINK} .endif .if !defined(NM) - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ + @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `lorder ${SOBJS} | tsort -q` ${LDADD} .else - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ + @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `NM=3D'${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} .endif --jCr45KaQ2ES41j5N Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk7cpUIACgkQC3+MBN1Mb4jvuQCgrtwpBdGs62gNlrbc//IbwAck FpwAn1viuk26sLf0u/u0E7g4Ncz3ti3k =x5Y3 -----END PGP SIGNATURE----- --jCr45KaQ2ES41j5N--