Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 1 | From b67c3a844bccec1766a7ec120e2d18cdcbc5f114 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 08:38:25 +0400 |
| 4 | Subject: [PATCH 02/46] uclibc-conf |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | --- |
| 10 | contrib/regression/objs-gcc.sh | 4 ++++ |
| 11 | libjava/classpath/ltconfig | 4 ++-- |
| 12 | 2 files changed, 6 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh |
| 15 | index 60b0497..6dc7ead 100755 |
| 16 | --- a/contrib/regression/objs-gcc.sh |
| 17 | +++ b/contrib/regression/objs-gcc.sh |
| 18 | @@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] |
| 19 | then |
| 20 | make all-gdb all-dejagnu all-ld || exit 1 |
| 21 | make install-gdb install-dejagnu install-ld || exit 1 |
| 22 | +elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] |
| 23 | + then |
| 24 | + make all-gdb all-dejagnu all-ld || exit 1 |
| 25 | + make install-gdb install-dejagnu install-ld || exit 1 |
| 26 | elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then |
| 27 | make bootstrap || exit 1 |
| 28 | make install || exit 1 |
| 29 | diff --git a/libjava/classpath/ltconfig b/libjava/classpath/ltconfig |
| 30 | index 743d951..ae4ea60 100755 |
| 31 | --- a/libjava/classpath/ltconfig |
| 32 | +++ b/libjava/classpath/ltconfig |
| 33 | @@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
| 34 | |
| 35 | # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 36 | case $host_os in |
| 37 | -linux-gnu*) ;; |
| 38 | +linux-gnu*|linux-uclibc*) ;; |
| 39 | linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 40 | esac |
| 41 | |
| 42 | @@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) |
| 43 | ;; |
| 44 | |
| 45 | # This must be Linux ELF. |
| 46 | -linux-gnu*) |
| 47 | +linux*) |
| 48 | version_type=linux |
| 49 | need_lib_prefix=no |
| 50 | need_version=no |
| 51 | -- |
| 52 | 2.6.3 |
| 53 | |