mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
cb403c34c6
This patch removes the configure test for working -z relro. The use of -z relro in Makeconfig became unconditional with commit 2e6ab1df44c412bb9d30b26a4d8a679150a7e375 Author: Ulrich Drepper <drepper@redhat.com> Date: Sat Oct 28 06:44:04 2006 +0000 Remove conditional code which now is unnecessary. (commit reference from git://repo.or.cz/glibc/history), so since then the configure test has not controlled anything about how glibc is built - simply about whether configure succeeds and allows a build to be attempted. The test for whether the option did something useful (as opposed to whether it exists - which we can certainly just assume by now) was originally added in <https://sourceware.org/ml/libc-hacker/2004-09/msg00069.html> to disable the option in a case when it did nothing useful on ia64 (as a result of something deliberate in the linker on ia64). Since 2006 that disabling has been of no effect, and given that the current test does not set libc_relro_required for ia64, it does nothing whatever useful for the original motivating case. Also at around the same time in 2006 the test was made to give an error for missing or broken -z relro support on various architectures. So effectively all the test does now is verify that, on certain architectures, the linker has not been changed deliberately to make the option ineffective. I see no apparent reason why such a change should be expected, or why the build should be stopped if it were to be made (any more than we disallow build on ia64); I think we can trust binutils patch review to point out the consequences of any change to COMMONPAGESIZE setting. The only thing that might now make sense would be disabling the -z relro use on an architecture-specific basis if there were an architecture-specific reason to consider that to make sense; it would be for the ia64 maintainer to decide if that makes sense for ia64 at present, but I think that could be done through sysdeps Makefiles - no special configure tests needed. Tested for x86_64 that this patch makes no change to the installed shared libraries. Together with <https://sourceware.org/ml/libc-alpha/2014-06/msg00788.html> (pending review) this substantially eliminates architecture-specific cases from architecture-independent configure.ac files. There remains an i386 case in sysdeps/mach/hurd/configure.ac that should properly move to the i386 subdirectory. (There are also OS-specific cases outside OS-specific directories; in principle I think should should also move.) * configure.ac (libc_commonpagesize): Remove variable. (libc_relro_required): Likewise. (libc_cv_z_relro): Remove configure test. * configure: Regenerated. * sysdeps/aarch64/preconfigure (libc_commonpagesize): Do not set variable. (libc_relro_required): Likewise. * sysdeps/alpha/preconfigure (libc_commonpagesize): Likewise. (libc_relro_required): Likewise. * sysdeps/arm/preconfigure.ac (libc_commonpagesize): Likewise. (libc_relro_required): Likewise. * sysdeps/arm/preconfigure: Regenerated. * sysdeps/ia64/preconfigure: Remove file. * sysdeps/tile/preconfigure (libc_commonpagesize): Do not set variable. (libc_relro_required): Likewise.
59 lines
1.7 KiB
Plaintext
59 lines
1.7 KiB
Plaintext
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
|
# Local preconfigure fragment for sysdeps/arm
|
|
|
|
case "$machine" in
|
|
arm*)
|
|
case $config_os in
|
|
linux-gnueabi*)
|
|
# If the compiler enables unwind tables by default, this causes
|
|
# problems with undefined symbols in -nostdlib link tests. To
|
|
# avoid this, add -fno-unwind-tables here and remove it in
|
|
# sysdeps/unix/sysv/linux/arm/configure.ac after those tests have
|
|
# been run.
|
|
if test "${CFLAGS+set}" != "set"; then
|
|
CFLAGS="-g -O2"
|
|
fi
|
|
CFLAGS="$CFLAGS -fno-unwind-tables"
|
|
;;
|
|
linux*)
|
|
AC_MSG_ERROR([Old ABI no longer supported])
|
|
;;
|
|
esac
|
|
|
|
base_machine=arm
|
|
# Lets ask the compiler which ARM family we've got
|
|
# Unfortunately it doesn't define any flags for implementations
|
|
# that you might pass to -mcpu or -mtune
|
|
# Note if you add patterns here you must ensure that
|
|
# an appropriate directory exists in sysdeps/arm
|
|
archcppflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null |
|
|
sed -n 's/^#define \(__ARM_ARCH_[0-9].*__\) .*$/\1/p'`
|
|
|
|
case "x$archcppflag" in
|
|
x__ARM_ARCH_[89]*__)
|
|
machine=armv7
|
|
AC_MSG_NOTICE([Found compiler is configured for something newer than v7 - using v7])
|
|
;;
|
|
|
|
x__ARM_ARCH_7A__)
|
|
machine=armv7
|
|
AC_MSG_NOTICE([Found compiler is configured for $machine])
|
|
;;
|
|
|
|
x__ARM_ARCH_6T2__)
|
|
machine=armv6t2
|
|
AC_MSG_NOTICE([Found compiler is configured for $machine])
|
|
;;
|
|
x__ARM_ARCH_6*__)
|
|
machine=armv6
|
|
AC_MSG_NOTICE([Found compiler is configured for $machine])
|
|
;;
|
|
*)
|
|
machine=arm
|
|
AC_MSG_WARN([arm/preconfigure: Did not find ARM architecture type; using default])
|
|
;;
|
|
esac
|
|
|
|
machine=arm/$machine
|
|
esac
|