+2014-09-16 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #6652]
+ * Makeconfig (soversions-default-setname): Remove variable.
+ ($(common-objpfx)soversions.i): Don't pass default_setname to
+ soversions.awk.
+ * Makerules ($(common-objpfx)abi-versions.h): Don't pass
+ oldest_abi to abi-versions.awk.
+ * config.h.in (GLIBC_OLDEST_ABI): Remove macro undefine.
+ * config.make.in (oldest-abi): Remove variable.
+ * configure.ac (--enable-oldest-abi): Remove configure option.
+ * configure: Regenerated.
+ * csu/version.c (banner) [GLIBC_OLDEST_ABI]: Remove conditional
+ text.
+ * scripts/abi-versions.awk: Do not handle oldest_abi variable.
+ * scripts/soversions.awk: Do not handle default_setname variable.
+ * sysdeps/mach/hurd/configure.ac: Do not handle oldest_abi
+ variable.
+ * sysdeps/mach/hurd/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/configure.ac: Do not handle oldest_abi
+ variable.
+ * sysdeps/unix/sysv/linux/configure: Regenerated.
+
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
* elf/Makefile (CFLAGS-interp.c): Remove.
$(subdir-srcdirs:=/shlib-versions)) \
$(..)shlib-versions
-soversions-default-setname = $(patsubst %, %,\
- $(filter-out %_default,\
- $(oldest-abi:%=GLIBC_%)))
$(common-objpfx)soversions.i: $(..)scripts/soversions.awk \
$(common-objpfx)shlib-versions.v
- $(AWK) -v default_setname='$(soversions-default-setname)' \
- -f $^ > $@T
+ $(AWK) -f $^ > $@T
mv -f $@T $@
$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig
(while read which lib number setname; do \
before-compile := $(common-objpfx)abi-versions.h $(before-compile)
$(common-objpfx)abi-versions.h: $(..)scripts/abi-versions.awk \
$(common-objpfx)Versions.all
- LC_ALL=C $(AWK) -v oldest_abi=$(oldest-abi) -f $^ > $@T
+ LC_ALL=C $(AWK) -f $^ > $@T
mv -f $@T $@
$(common-objpfx)%.latest: $(common-objpfx)abi-versions.h
* The following bugs are resolved with this release:
- 17266, 17363, 17370, 17371.
+ 6652, 17266, 17363, 17370, 17371.
\f
Version 2.20
directive. */
#undef HAVE_ASM_POPSECTION_DIRECTIVE
-/* Defined to the oldest ABI we support, like 2.1. */
-#undef GLIBC_OLDEST_ABI
-
/* Define if static NSS modules are wanted. */
#undef DO_STATIC_NSS
static-libgcc = @libc_cv_gcc_static_libgcc@
-oldest-abi = @oldest_abi@
exceptions = @exceptions@
multi-arch = @multi_arch@
bindnow
enable_lock_elision
hardcoded_path_in_tests
-oldest_abi
use_default_link
sysheaders
with_fp
enable_sanity_checks
enable_shared
enable_profile
-enable_oldest_abi
enable_hardcoded_path_in_tests
enable_stackguard_randomization
enable_lock_elision
in special situations) [default=yes]
--enable-shared build shared library [default=yes if GNU ld]
--enable-profile build profiled library [default=no]
- --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
- [default=glibc default]
--enable-hardcoded-path-in-tests
hardcode newly built glibc path in tests
[default=no]
fi
-# Check whether --enable-oldest-abi was given.
-if test "${enable_oldest_abi+set}" = set; then :
- enableval=$enable_oldest_abi; oldest_abi=$enableval
-else
- oldest_abi=no
-fi
-
-if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
- oldest_abi=default
-else
- cat >>confdefs.h <<_ACEOF
-#define GLIBC_OLDEST_ABI "$oldest_abi"
-_ACEOF
-
-fi
-
-
# Check whether --enable-hardcoded-path-in-tests was given.
if test "${enable_hardcoded_path_in_tests+set}" = set; then :
enableval=$enable_hardcoded_path_in_tests; hardcoded_path_in_tests=$enableval
[profile=$enableval],
[profile=no])
-AC_ARG_ENABLE([oldest-abi],
- AC_HELP_STRING([--enable-oldest-abi=ABI],
- [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
- [oldest_abi=$enableval],
- [oldest_abi=no])
-if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
- oldest_abi=default
-else
- AC_DEFINE_UNQUOTED(GLIBC_OLDEST_ABI, "$oldest_abi")
-fi
-AC_SUBST(oldest_abi)
-
AC_ARG_ENABLE([hardcoded-path-in-tests],
AC_HELP_STRING([--enable-hardcoded-path-in-tests],
[hardcode newly built glibc path in tests @<:@default=no@:>@]),
#ifdef LIBC_ABIS_STRING
LIBC_ABIS_STRING
#endif
-#ifdef GLIBC_OLDEST_ABI
-"The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n"
-#endif
"For bug reporting instructions, please see:\n\
"REPORT_BUGS_TO".\n";
# Script to generate <abi-versions.h> header file from Versions.all list.
# See include/shlib-compat.h comments for explanation.
-# This script expects the following variables to be defined:
-# oldest_abi the oldest ABI supported
-
BEGIN {
print "/* This file is automatically generated by abi-versions.awk.";
print " It defines symbols used by shlib-compat.h, which see. */";
printf "#define ABI_%s_%s\tABI_%s_%s\n", libid, oldid, libid, newid;
printf "#define VERSION_%s_%s\t%s\n", libid, oldid, new;
- if ("GLIBC_" oldest_abi == old)
- oldest_abi = "default";
next;
}
printf "#define ABI_%s_%s\t%d\t/* support %s */\n", libid, versid, ++n, vers;
printf "#define VERSION_%s_%s\t%s\n", libid, versid, vers;
- if ("GLIBC_" oldest_abi == vers)
- start = 1;
- if (start == 0 && oldest_abi != "default")
- --n;
next;
}
if (lib in versions)
set = versions[lib];
else {
- set = default_setname;
+ set = "";
if (ndefault_set >= 1)
set = default_set[1];
}
$as_echo "#define NO_HIDDEN 1" >>confdefs.h
-case "$machine" in
- i386*)
- # The default oldest ABI is 2.2.6.
- # We only need a "yes" here if the oldest ABI supported will be < 2.2.6.
- if test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.6"; then
- libc_cv_gcc_unwind_find_fde=yes
- fi
- ;;
-esac
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5
$as_echo_n "checking Hurd header version... " >&6; }
dnl We need this setting because of the need for PLT calls in ld.so.
AC_DEFINE([NO_HIDDEN])
-case "$machine" in
- i386*)
- # The default oldest ABI is 2.2.6.
- # We only need a "yes" here if the oldest ABI supported will be < 2.2.6.
- if test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.6"; then
- libc_cv_gcc_unwind_find_fde=yes
- fi
- ;;
-esac
-
AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl
AC_TRY_COMPILE(dnl
[#include <hurd/version.h>], [
-# The result of the above test for the use of the FDE code is invalid if
-# the user overrides the decision about the minimum ABI.
-if test "$oldest_abi" != default && test "2.2.4" \< "$oldest_abi"; then
- libc_cv_gcc_unwind_find_fde=no
-fi
-
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
[AC_DEFINE(HAVE_LINUX_FANOTIFY_H)], ,
[/* No default includes. */])
-# The result of the above test for the use of the FDE code is invalid if
-# the user overrides the decision about the minimum ABI.
-if test "$oldest_abi" != default && test "2.2.4" \< "$oldest_abi"; then
- libc_cv_gcc_unwind_find_fde=no
-fi
-
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
projects / platform / upstream / glibc.git / commitdiff