From 4b968931720cdf273465db07be69802e60304981 Mon Sep 17 00:00:00 2001 From: joseph Date: Tue, 10 May 2011 15:49:03 +0000 Subject: Merge changes between r13697 and r13758 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@13759 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- ports/ChangeLog.arm | 5 +++++ ports/sysdeps/arm/preconfigure | 2 +- ports/sysdeps/arm/shlib-versions | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ports') diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index e4e637173..6a9bdde8f 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,8 @@ +2011-05-07 Konstantinos Margaritis + + * sysdeps/arm/preconfigure: Detect arm-linux-gnueabi* as ARM EABI. + * sysdeps/arm/shlib-versions: Ditto. + 2011-04-26 Manjunath Matti * sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S diff --git a/ports/sysdeps/arm/preconfigure b/ports/sysdeps/arm/preconfigure index 4b974cbe9..e7693d4e7 100644 --- a/ports/sysdeps/arm/preconfigure +++ b/ports/sysdeps/arm/preconfigure @@ -2,7 +2,7 @@ case "$machine" in arm*) base_machine=arm case $config_os in - linux-gnueabi) + linux-gnueabi*) machine=arm/eabi/$machine if [ "${CFLAGS+set}" != "set" ]; then CFLAGS="-g -O2" diff --git a/ports/sysdeps/arm/shlib-versions b/ports/sysdeps/arm/shlib-versions index ed6603f07..491dd0adc 100644 --- a/ports/sysdeps/arm/shlib-versions +++ b/ports/sysdeps/arm/shlib-versions @@ -1,4 +1,4 @@ -arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4 +arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 -arm.*-.*-linux-gnueabi ld=ld-linux.so.3 +arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 arm.*-.*-linux.* ld=ld-linux.so.2 -- cgit v1.2.1