[glibc/f17] - Update arm specific configury.
Jeffrey Law
law at fedoraproject.org
Fri Jun 1 04:53:54 UTC 2012
commit 8cb6cdad80b34c3acbf5f27ffde900a8cf9481eb
Author: Jeff Law <law at redhat.com>
Date: Thu May 31 22:53:39 2012 -0600
- Update arm specific configury.
glibc-arm-hardfloat-2.patch | 289 +++++++++++++++++++++++++++++++++++++++++++
glibc.spec | 14 ++-
2 files changed, 299 insertions(+), 4 deletions(-)
---
diff --git a/glibc-arm-hardfloat-2.patch b/glibc-arm-hardfloat-2.patch
index 3592312..b54951b 100644
--- a/glibc-arm-hardfloat-2.patch
+++ b/glibc-arm-hardfloat-2.patch
@@ -40,3 +40,292 @@ diff -rup c/sysdeps/arm/shlib-versions d/sysdeps/arm/shlib-versions
+%endif
arm.*-.*-linux.* ld=ld-linux.so.2
+*** a/sysdeps/arm/configure Sun Jan 8 22:47:04 2012
+--- b/sysdeps/arm/configure Tue May 8 12:37:21 2012
+***************
+*** 1 ****
+--- 1,100 ----
++
++ # as_fn_set_status STATUS
++ # -----------------------
++ # Set $? to STATUS, without forking.
++ as_fn_set_status ()
++ {
++ return $1
++ } # as_fn_set_status
++
++ # as_fn_exit STATUS
++ # -----------------
++ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++ as_fn_exit ()
++ {
++ set +e
++ as_fn_set_status $1
++ exit $1
++ } # as_fn_exit
++ # as_fn_arith ARG...
++ # ------------------
++ # Perform arithmetic evaluation on the ARGs, and store the result in the
++ # global $as_val. Take advantage of shells that can avoid forks. The arguments
++ # must be portable across $(()) and expr.
++ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++ eval 'as_fn_arith ()
++ {
++ as_val=$(( $* ))
++ }'
++ else
++ as_fn_arith ()
++ {
++ as_val=`expr "$@" || test $? -eq 1`
++ }
++ fi # as_fn_arith
++
++ if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
++ as_expr=expr
++ else
++ as_expr=false
++ fi
++
++ if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++ as_basename=basename
++ else
++ as_basename=false
++ fi
++
++ as_me=`$as_basename -- "$0" ||
++ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++ $as_echo X/"$0" |
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++
++
++ as_lineno_1=$LINENO as_lineno_1a=$LINENO
++ as_lineno_2=$LINENO as_lineno_2a=$LINENO
++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
++ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
++ N
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
++ t loop
++ s/-\n.*//
++ ' >$as_me.lineno &&
++ chmod +x "$as_me.lineno" ||
++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
++
++ # Don't try to exec as it changes $[0], causing all sort of problems
++ # (the dirname of $[0] is not the place where we might find the
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
++ # Exit status is that of the last command.
++ exit
++ }
++
+ # This file is generated from configure.in by Autoconf. DO NOT EDIT!
+***************
+*** 26,33 ****
+ fi
+! { $as_echo "$as_me:$LINENO: result: $libc_cv_asm_cfi_directive_sections" >&5
+ $as_echo "$libc_cv_asm_cfi_directive_sections" >&6; }
+ if test $libc_cv_asm_cfi_directive_sections != yes; then
+! { { $as_echo "$as_me:$LINENO: error: need .cfi_sections in this configuration" >&5
+! $as_echo "$as_me: error: need .cfi_sections in this configuration" >&2;}
+! { (exit 1); exit 1; }; }
+ fi
+--- 163,335 ----
+ fi
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_cfi_directive_sections" >&5
+ $as_echo "$libc_cv_asm_cfi_directive_sections" >&6; }
+ if test $libc_cv_asm_cfi_directive_sections != yes; then
+! as_fn_error $? "need .cfi_sections in this configuration" "$LINENO" 5
+! fi
+!
+! # We check to see if the compiler and flags are
+! # selecting the hard-float ABI and if they are then
+! # we set libc_cv_arm_pcs_vfp to yes which causes
+! # HAVE_ARM_PCS_VFP to be defined in config.h and
+! # in include/libc-symbols.h and thus available to
+! # shlib-versions to select the appropriate name for
+! # the dynamic linker via %ifdef.
+!
+!
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+! $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+! if ${ac_cv_path_GREP+:} false; then :
+! $as_echo_n "(cached) " >&6
+! else
+! if test -z "$GREP"; then
+! ac_path_GREP_found=false
+! # Loop through the user's path and test for each of PROGNAME-LIST
+! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+! do
+! IFS=$as_save_IFS
+! test -z "$as_dir" && as_dir=.
+! for ac_prog in grep ggrep; do
+! for ac_exec_ext in '' $ac_executable_extensions; do
+! ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+! { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+! # Check for GNU ac_path_GREP and select it if it is found.
+! # Check for GNU $ac_path_GREP
+! case `"$ac_path_GREP" --version 2>&1` in
+! *GNU*)
+! ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+! *)
+! ac_count=0
+! $as_echo_n 0123456789 >"conftest.in"
+! while :
+! do
+! cat "conftest.in" "conftest.in" >"conftest.tmp"
+! mv "conftest.tmp" "conftest.in"
+! cp "conftest.in" "conftest.nl"
+! $as_echo 'GREP' >> "conftest.nl"
+! "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+! diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+! as_fn_arith $ac_count + 1 && ac_count=$as_val
+! if test $ac_count -gt ${ac_path_GREP_max-0}; then
+! # Best one so far, save it but keep looking for a better one
+! ac_cv_path_GREP="$ac_path_GREP"
+! ac_path_GREP_max=$ac_count
+! fi
+! # 10*(2^10) chars as input seems more than enough
+! test $ac_count -gt 10 && break
+! done
+! rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+! esac
+!
+! $ac_path_GREP_found && break 3
+! done
+! done
+! done
+! IFS=$as_save_IFS
+! if test -z "$ac_cv_path_GREP"; then
+! as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+! fi
+! else
+! ac_cv_path_GREP=$GREP
+! fi
+!
+! fi
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+! $as_echo "$ac_cv_path_GREP" >&6; }
+! GREP="$ac_cv_path_GREP"
+!
+!
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+! $as_echo_n "checking for egrep... " >&6; }
+! if ${ac_cv_path_EGREP+:} false; then :
+! $as_echo_n "(cached) " >&6
+! else
+! if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+! then ac_cv_path_EGREP="$GREP -E"
+! else
+! if test -z "$EGREP"; then
+! ac_path_EGREP_found=false
+! # Loop through the user's path and test for each of PROGNAME-LIST
+! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+! do
+! IFS=$as_save_IFS
+! test -z "$as_dir" && as_dir=.
+! for ac_prog in egrep; do
+! for ac_exec_ext in '' $ac_executable_extensions; do
+! ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+! { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+! # Check for GNU ac_path_EGREP and select it if it is found.
+! # Check for GNU $ac_path_EGREP
+! case `"$ac_path_EGREP" --version 2>&1` in
+! *GNU*)
+! ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+! *)
+! ac_count=0
+! $as_echo_n 0123456789 >"conftest.in"
+! while :
+! do
+! cat "conftest.in" "conftest.in" >"conftest.tmp"
+! mv "conftest.tmp" "conftest.in"
+! cp "conftest.in" "conftest.nl"
+! $as_echo 'EGREP' >> "conftest.nl"
+! "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+! diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+! as_fn_arith $ac_count + 1 && ac_count=$as_val
+! if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+! # Best one so far, save it but keep looking for a better one
+! ac_cv_path_EGREP="$ac_path_EGREP"
+! ac_path_EGREP_max=$ac_count
+! fi
+! # 10*(2^10) chars as input seems more than enough
+! test $ac_count -gt 10 && break
+! done
+! rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+! esac
+!
+! $ac_path_EGREP_found && break 3
+! done
+! done
+! done
+! IFS=$as_save_IFS
+! if test -z "$ac_cv_path_EGREP"; then
+! as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+! fi
+! else
+! ac_cv_path_EGREP=$EGREP
+! fi
+!
+! fi
+! fi
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+! $as_echo "$ac_cv_path_EGREP" >&6; }
+! EGREP="$ac_cv_path_EGREP"
+!
+!
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is using the ARM hard-float ABI" >&5
+! $as_echo_n "checking whether the compiler is using the ARM hard-float ABI... " >&6; }
+! if ${libc_cv_arm_pcs_vfp+:} false; then :
+! $as_echo_n "(cached) " >&6
+! else
+! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+! /* end confdefs.h. */
+! #ifdef __ARM_PCS_VFP
+! yes
+! #endif
+!
+! _ACEOF
+! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+! $EGREP "yes" >/dev/null 2>&1; then :
+! libc_cv_arm_pcs_vfp=yes
+! else
+! libc_cv_arm_pcs_vfp=no
+! fi
+! rm -f conftest*
+!
+! fi
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp" >&5
+! $as_echo "$libc_cv_arm_pcs_vfp" >&6; }
+! if test $libc_cv_arm_pcs_vfp = yes; then
+! $as_echo "#define HAVE_ARM_PCS_VFP 1" >>confdefs.h
+!
+ fi
diff --git a/glibc.spec b/glibc.spec
index 1b8408a..bb1a28f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 38%{?dist}
+Release: 39%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -114,7 +114,6 @@ Patch1046: %{name}-rh806403.patch
Patch1048: %{name}-rh804792.patch
Patch1052: %{name}-sw13979.patch
Patch1053: %{name}-rh817276.patch
-Patch1054: %{name}-rh819430.patch
#
# Patches submitted, but not yet approved upstream.
@@ -194,6 +193,9 @@ Patch2055: %{name}-arm-hardfloat-2.patch
# Upstream BZ 13753, probably will be fixed differently
Patch2056: %{name}-rh801650-3.patch
+# Upstream BZ 14185
+Patch2057: %{name}-rh819430.patch
+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
Obsoletes: nss_db
@@ -461,7 +463,6 @@ rm -rf %{glibcportsdir}
%patch2051 -p1
%patch1052 -p1
%patch2054 -p1
-%patch1054 -p1
pushd ../%{glibcportsdir}
%patch1053 -p1
@@ -469,6 +470,7 @@ pushd ../%{glibcportsdir}
popd
%patch2056 -p1
+%patch2057 -p1
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@@ -1321,8 +1323,12 @@ rm -f *.filelist*
%endif
%changelog
+* Fri Jun 1 2012 Jeff Law <law at redhat.com> - 2.15-39
+ - Update arm specific configury.
+
* Thu May 24 2012 Patsy Franklin <pfrankli at redhat.com> - 2.15-38
- - Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430)
+ - Fix fnmatch() when '*' wildcard is applied on a file name containing
+ multibyte chars. (#819430)
* Thu May 10 2012 Jeff Law <law at redhat.com> - 2.15-37
- Try again to fix AVX testing (#801650)
More information about the scm-commits
mailing list