Date: Mon, 5 Dec 2011 13:04:35 +0200 From: Kostik Belousov <kostikbel@gmail.com> To: Jilles Tjoelker <jilles@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228269 - head/lib/libc/locale Message-ID: <20111205110435.GP50300@deviant.kiev.zoral.com.ua> In-Reply-To: <201112050000.pB500mrQ008548@svn.freebsd.org> References: <201112050000.pB500mrQ008548@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <kostik@sirion> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111205110435.GP50300>