diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-09-07 10:09:06 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-09-07 10:09:06 +0200 |
| commit | 317ff8d356d51ca43eb063e229c8732c187493e5 (patch) | |
| tree | 7994d6ebcb136b91048f8e23b63d15ddab734d68 | |
| parent | cf2e25191323ba04233ddc23f2175eb0562dc03d (diff) | |
| parent | d76da20f7f77e9dfc7e81ebaf0f9902699a873e8 (diff) | |
| download | glibc-317ff8d356d51ca43eb063e229c8732c187493e5.tar.gz glibc-317ff8d356d51ca43eb063e229c8732c187493e5.tar.xz glibc-317ff8d356d51ca43eb063e229c8732c187493e5.zip | |
Merge commit 'origin/master' into fedora/master
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | posix/getconf.c | 1 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strstr-c.c | 3 |
5 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index d7eb6eb6ea..e81bcac86a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-09-07 Ulrich Drepper <drepper@redhat.com> + + * posix/getconf.c (vars): Handle POSIX2_LINE_MAX in addition to + _POSIX2_LINE_MAX. + +2009-09-04 H.J. Lu <hongjiu.lu@intel.com> + + * configure.in: Support binutils 2.20. + +2009-09-03 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/i386/i686/multiarch/strstr-c.c (__strstr_sse42, + __strstr_ia32): Add attribute_hidden. + 2009-09-01 Andreas Schwab <schwab@redhat.com> * hesiod/nss_hesiod/hesiod-grp.c (internal_gid_from_group): Fix diff --git a/configure b/configure index 48e6952bbd..b1d84d7fe3 100755 --- a/configure +++ b/configure @@ -4841,7 +4841,7 @@ $as_echo_n "checking version of $AS... " >&6; } ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[3-9]*) + 2.1[3-9]*|[2-9].[2-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -4904,7 +4904,7 @@ $as_echo_n "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[3-9]*) + 2.1[3-9]*|[2-9].[2-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; diff --git a/configure.in b/configure.in index 4584afe605..7c4f71fda7 100644 --- a/configure.in +++ b/configure.in @@ -897,10 +897,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in # Accept binutils 2.13 or newer. AC_CHECK_PROG_VER(AS, $AS, --version, [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[3-9]*], AS=: critic_missing="$critic_missing as") + [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as") AC_CHECK_PROG_VER(LD, $LD, --version, [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], - [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") + [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld") # We need the physical current working directory. We cannot use the # "pwd -P" shell builtin since that's not portable. Instead we try to diff --git a/posix/getconf.c b/posix/getconf.c index c9e1300e49..facf5b08f5 100644 --- a/posix/getconf.c +++ b/posix/getconf.c @@ -484,6 +484,7 @@ static const struct conf vars[] = #endif #ifdef _SC_LINE_MAX { "_POSIX2_LINE_MAX", _SC_LINE_MAX, SYSCONF }, + { "POSIX2_LINE_MAX", _SC_LINE_MAX, SYSCONF }, #endif #ifdef _SC_2_LOCALEDEF { "POSIX2_LOCALEDEF", _SC_2_LOCALEDEF, SYSCONF }, diff --git a/sysdeps/i386/i686/multiarch/strstr-c.c b/sysdeps/i386/i686/multiarch/strstr-c.c index 7ef1157ce4..efa9f78f81 100644 --- a/sysdeps/i386/i686/multiarch/strstr-c.c +++ b/sysdeps/i386/i686/multiarch/strstr-c.c @@ -7,6 +7,7 @@ #include "string/strstr.c" -extern char *__strstr_sse42 (const char *, const char *); +extern char *__strstr_sse42 (const char *, const char *) attribute_hidden; +extern __typeof (__strstr_ia32) __strstr_ia32 attribute_hidden; libc_ifunc (strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_ia32); |