From 973e48a12220e56e06ad5d839473e5cdefef8e71 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Aug 2009 11:15:06 +0200
Subject: fix eglibc/glibc support on lemote 64 bit

---
 toolchain/glibc/Makefile             |  3 ++-
 toolchain/glibc/patches/mips64.patch | 26 --------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index e1b48f4e9..36d6f1214 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -36,7 +36,8 @@ GLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			LD=${REAL_GNU_TARGET_NAME}-ld \
 			libc_cv_forced_unwind=yes \
 			libc_cv_c_cleanup=yes \
-			libc_cv_gnu99_inline=yes
+			libc_cv_gnu99_inline=yes \
+			libc_cv_slibdir="/lib"
 
 ifeq ($(ADK_DEVICE_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
diff --git a/toolchain/glibc/patches/mips64.patch b/toolchain/glibc/patches/mips64.patch
index 04743e09d..0b53244b9 100644
--- a/toolchain/glibc/patches/mips64.patch
+++ b/toolchain/glibc/patches/mips64.patch
@@ -30,29 +30,3 @@ diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/preconfigure glibc-2.10-cur
  		fi
  		;;
  mips*)		base_machine=mips machine=mips/mips32/$machine ;;
-diff -Nur glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure
---- glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure	2009-05-26 22:53:29.000000000 +0200
-+++ glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure	2009-05-27 20:34:25.000000000 +0200
-@@ -84,22 +84,6 @@
-   # and libc_cv_localedir.
-   test -n "$libc_cv_slibdir" || \
-   case $machine in
--  mips/mips64/n64/* )
--    libc_cv_slibdir="/lib64"
--    if test "$libdir" = '${exec_prefix}/lib'; then
--      libdir='${exec_prefix}/lib64';
--      # Locale data can be shared between 32bit and 64bit libraries
--      libc_cv_localedir='${exec_prefix}/lib/locale'
--    fi
--    ;;
--  mips/mips64/n32/* )
--    libc_cv_slibdir="/lib32"
--    if test "$libdir" = '${exec_prefix}/lib'; then
--      libdir='${exec_prefix}/lib32';
--      # Locale data can be shared between 32bit and 64bit libraries
--      libc_cv_localedir='${exec_prefix}/lib/locale'
--    fi
--    ;;
-   *)
-     libc_cv_slibdir="/lib"
-     ;;
-- 
cgit v1.2.3