eglibc: Add ARM hf dynamic linker support
The work is done in glibc upstream we backport the relevant patches (From OE-Core rev: 8df03a0b8bd92cf7b73b816dacf3e362cfce557a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
Richard Purdie
parent
e108db7acc
commit
0fdd04febe
|
|
@ -0,0 +1,28 @@
|
|||
From: Carlos O'Donell <carlos_odonell@mentor.com>
|
||||
Date: Mon, 7 May 2012 20:04:41 +0000 (-0400)
|
||||
Subject: ARM: Define HAVE_ARM_PCS_VFP in config.h.
|
||||
X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=6a43ec980c5a0500149ef37d4854eac0e270da6f;hp=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc
|
||||
|
||||
ARM: Define HAVE_ARM_PCS_VFP in config.h.
|
||||
|
||||
If the compiler and flags would select the hard-float ABI
|
||||
then the ARM configure fragment will set HAVE_ARM_PCS_VFP.
|
||||
This is later used by the ARM shlib-versions to select
|
||||
the appropriately named dynamic linker.
|
||||
---
|
||||
|
||||
Upstream-Status: Backport
|
||||
-Khem
|
||||
|
||||
Index: libc/config.h.in
|
||||
===================================================================
|
||||
--- libc.orig/config.h.in 2012-01-04 22:06:28.000000000 -0800
|
||||
+++ libc/config.h.in 2012-05-08 11:25:56.581079069 -0700
|
||||
@@ -233,4 +233,7 @@
|
||||
|
||||
#define HAVE_REGEX 1
|
||||
|
||||
+/* The ARM hard-float ABI is being used. */
|
||||
+#undef HAVE_ARM_PCS_VFP
|
||||
+
|
||||
#endif
|
||||
|
|
@ -0,0 +1,338 @@
|
|||
From d3b36017d43af570ca7f79e711749dd4ade76979 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos O'Donell <carlos_odonell@mentor.com>
|
||||
Date: Mon, 7 May 2012 22:14:44 -0400
|
||||
Subject: [PATCH] ARM: Use /lib/ld-linux-armhf.so.3 for the hard-float ABI.
|
||||
|
||||
The hard-float ABI will now use /lib/ld-linux-armhf.so.3.
|
||||
We detect the use of the hard-float ABI and select the
|
||||
appropriate dynamic linker name. You must have a new or
|
||||
patched compiler which also uses the new dynamic loader
|
||||
name when the hard-float ABI is selected.
|
||||
---
|
||||
ChangeLog.arm | 8 ++
|
||||
sysdeps/arm/configure | 184 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
sysdeps/arm/configure.in | 17 ++++
|
||||
sysdeps/arm/shlib-versions | 8 ++-
|
||||
4 files changed, 216 insertions(+), 1 deletions(-)
|
||||
mode change 100644 => 100755 sysdeps/arm/configure
|
||||
|
||||
Upstream-Status: Backport
|
||||
-Khem
|
||||
|
||||
Index: libc/ports/sysdeps/arm/configure.in
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/configure.in 2012-05-08 11:42:59.161128560 -0700
|
||||
+++ libc/ports/sysdeps/arm/configure.in 2012-05-08 11:43:29.373130066 -0700
|
||||
@@ -18,3 +18,20 @@
|
||||
if test $libc_cv_asm_cfi_directive_sections != yes; then
|
||||
AC_MSG_ERROR([need .cfi_sections in this configuration])
|
||||
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.
|
||||
+AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI],
|
||||
+ [libc_cv_arm_pcs_vfp],
|
||||
+ [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP
|
||||
+ yes
|
||||
+ #endif
|
||||
+ ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
|
||||
+if test $libc_cv_arm_pcs_vfp = yes; then
|
||||
+ AC_DEFINE(HAVE_ARM_PCS_VFP)
|
||||
+fi
|
||||
Index: libc/ports/sysdeps/arm/shlib-versions
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/shlib-versions 2012-05-08 11:42:59.145128546 -0700
|
||||
+++ libc/ports/sysdeps/arm/shlib-versions 2012-05-08 11:43:29.409130022 -0700
|
||||
@@ -1,4 +1,10 @@
|
||||
arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4
|
||||
|
||||
-arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3
|
||||
+%ifdef HAVE_ARM_PCS_VFP
|
||||
+# The EABI-derived hard-float ABI uses a new dynamic linker.
|
||||
+arm.*-.*-linux-gnueabi.* ld=ld-linux-armhf.so.3
|
||||
+%else
|
||||
+# The EABI-derived soft-float ABI continues to use ld-linux.so.3.
|
||||
+arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3
|
||||
+%endif
|
||||
arm.*-.*-linux.* ld=ld-linux.so.2
|
||||
Index: libc/ports/sysdeps/arm/configure
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/configure 2012-05-08 11:43:46.437130836 -0700
|
||||
+++ libc/ports/sysdeps/arm/configure 2012-05-08 11:49:10.393145653 -0700
|
||||
@@ -1,3 +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!
|
||||
# Local configure fragment for sysdeps/arm.
|
||||
|
||||
@@ -31,3 +128,170 @@
|
||||
$as_echo "$as_me: error: need .cfi_sections in this configuration" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
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
|
||||
|
|
@ -3,7 +3,7 @@ require eglibc.inc
|
|||
SRCREV = "17386"
|
||||
|
||||
DEPENDS += "gperf-native"
|
||||
PR = "r10"
|
||||
PR = "r11"
|
||||
PR_append = "+svnr${SRCPV}"
|
||||
|
||||
EGLIBC_BRANCH="eglibc-2_15"
|
||||
|
|
@ -25,6 +25,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
|
|||
file://initgroups_keys.patch \
|
||||
file://use-localstatedir-for-vardbdir.patch \
|
||||
file://eglibc_fix_findidx_parameters.patch \
|
||||
file://add_HAVE_ARM_PCS_VFP.patch \
|
||||
file://ldso_arm_hf_support.patch \
|
||||
"
|
||||
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
|
||||
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
||||
|
|
|
|||
Loading…
Reference in New Issue