A few more little cleanups

4 files changed, 6 insertions, 192 deletions

diff --git a/Makefile b/Makefile
index b4fafeff9..79ff9950a 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ headers: dummy
 	    ln -fs $(KERNEL_SOURCE)/include/asm-ppc include/asm; \
 	elif [ $(TARGET_ARCH) = "v850" ];then \
 	    ln -fs $(KERNEL_SOURCE)/include/asm-v850 include/asm; \
-	elif [ $(TARGET_ARCH) = "mipsel" ];then \
+	elif [ $(TARGET_ARCH) = "mips" ];then \
 	    ln -fs $(KERNEL_SOURCE)/include/asm-mips include/asm; \
 	elif [ $(TARGET_ARCH) = "h8300" ];then \
 	    ln -fs $(KERNEL_SOURCE)/include/asm-h8300 include/asm; \
diff --git a/Rules.mak b/Rules.mak
index e75115e78..92e0ef6e6 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -43,7 +43,8 @@ NATIVE_ARCH = ${shell uname -m | sed \
 		-e 's/m68k.*/m68k/' \
 		-e 's/ppc/powerpc/g' \
 		-e 's/v850.*/v850/g' \
-		-e 's/sh[234]/sh/' \
+		-e 's/sh[234].*/sh/' \
+		-e 's/mips.*/mips/' \
 		}
 ifeq ($(strip $(TARGET_ARCH)),)
 TARGET_ARCH=${shell $(CC) -dumpmachine | sed -e s'/-.*//' \
@@ -54,6 +55,7 @@ TARGET_ARCH=${shell $(CC) -dumpmachine | sed -e s'/-.*//' \
 		-e 's/ppc/powerpc/g' \
 		-e 's/v850.*/v850/g' \
 		-e 's/sh[234]/sh/' \
+		-e 's/mips.*/mips/' \
 		}
 endif
 
@@ -106,6 +108,7 @@ ifeq ($(strip $(HAVE_SHARED)),true)
 BUILD_DYNAMIC_LINKER=${shell cd $(TOPDIR)lib && pwd}/$(UCLIBC_LDSO)
     else
     LDSO=$(SYSTEM_LDSO)
+    BUILD_UCLIBC_LDSO=false
     DYNAMIC_LINKER=/lib/$(notdir $(SYSTEM_LDSO))
     BUILD_DYNAMIC_LINKER=/lib/$(notdir $(SYSTEM_LDSO))
 endif
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
deleted file mode 100644
index 0e85cfe80..000000000
--- a/extra/Configs/Config.mipsel
+++ /dev/null
@@ -1,189 +0,0 @@
-# Library Configuration rules for uClibc
-#
-# This file contains rules which are shared between multiple Makefiles.  All
-# normal configuration options live in the file named "Config".  You probably
-# should not mess with this file unless you know what you are doing...  
-# 
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersee@debian.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
-
-NATIVE_CC = gcc
-
-# If you are running a cross compiler, you may want to set this
-# to something more interesting...  Target architecture is determined
-# by asking this compiler what arch it compiles stuff for.
-CROSS = mipsel-linux-
-CC = $(CROSS)gcc
-AR = $(CROSS)ar
-LD = $(CROSS)ld
-STRIPTOOL = $(CROSS)strip
-#STRIPTOOL = /bin/true
-
-# Set the following to `true' to make a debuggable build, and `false' for
-# production builds.
-DODEBUG = false
-
-# Compiler warnings you want to see 
-WARNINGS=-Wall
-
-# Note that the kernel source you use to compile with should be the same as the
-# Linux kernel you run your apps on.  uClibc doesn't even try to achieve binary
-# compatibility across kernel versions.  So don't expect, for example, uClibc
-# compiled with Linux kernel 2.0.x to implement lchown properly, since 2.0.x
-# can't do that. Similarly, if you compile uClibc vs Linux 2.4.x kernel headers,
-# but then run on Linux 2.0.x, lchown will be compiled into uClibc, but won't
-# work at all.  You have been warned.
-KERNEL_SOURCE=/usr/src/linux
-
-# Set this to `false' if your CPU doesn't have a memory management unit (MMU).
-# Set it to `true' otherwise.
-HAS_MMU = true
-
-# Set this to `false' if you don't have/need basic floating point support
-# support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# If this is not true, then libm will not be built.
-HAS_FLOATING_POINT = true
-
-# Set to `true' if you want the math library to contain the full set
-# of C99 math library features.  Costs an extra 35k or so on x86. 
-DO_C99_MATH = false
-
-# Set this to `false' if you don't have/need "(unsigned) long long int" support.
-# Set it to `true' otherwise.
-# Affects *printf and *scanf functions.
-# Also omits strto(u)ll, and (u)lltostr from the library if `false'.
-HAS_LONG_LONG = true
-
-# Set this to 'false if you don't need shadow password support.
-HAS_SHADOW = false
-
-# Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
-HAS_LOCALE = false
-
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
-
-# This specifies which malloc implementation is used.
-# "malloc-simple" is very, very small, but is also very, very dumb 
-# and does not try to make good use of memory or clean up after itself.
-#
-# "malloc" on the other hand is a bit bigger, but is pretty smart thereby
-# minimizing memory wastage and reusing already allocated memory.  This 
-# can be lots faster and safer IMHO.
-#
-# "malloc-930716" is from libc-5.3.12 and was/is the standard gnu malloc.
-# It is actually smaller than "malloc", at least on i386.  Right now, it
-# only works on i386 (and maybe m68k) because it needs sbrk.
-MALLOC = malloc-simple
-#MALLOC = malloc 
-#MALLOC = malloc-930716
-
-# If you want to collect common syscall code into one function, set to this to
-# `true'.  Set it to false otherwise.
-# On i386 this saves about than 2.8k over all syscalls.
-# The idea came from the implementation in dietlibc.
-# At present, only affects i386.
-UNIFIED_SYSCALL = false
-
-# If you want large file support (greater then 2 GiB) turn this on.
-# Do not enable this unless your kernel provides large file support.
-DOLFS = false
-
-# Posix regular expression code is really big -- 27k all by itself.
-# If you don't use regular expressions, turn this off and save space.
-# Of course, if you only staticly link, leave this on, since it will
-# only be included in your apps if you use regular expressions. 
-INCLUDE_REGEX=true
-
-# If you want to include RPC support, enable this.  RPC is almost never used 
-# for anything except NFS support, so unless you plan to use NFS, leave this
-# disabled.  This is off by default.
-INCLUDE_RPC = false
-
-# If you want to include support for the next version of the Internet
-# Protocol: IP version 6, enable this.  This is off by default.
-INCLUDE_IPV6 = false
-
-# If you want to support only Unix 98 PTYs enable this.  Some older
-# applications may need this disabled.  For most current programs, 
-# you can generally leave this true.
-UNIX98PTY_ONLY = true
-
-# Enable this if /dev/pts is on a devpts or devfs file system.  Both
-# these filesystems automatically manage permissions on the /dev/pts 
-# devices.  You may need to mount this fs on /dev/pts for this to work. 
-# This is true by default.
-ASSUME_DEVPTS = true
-
-
-# If you want to compile the library as PIC code, turn this on.
-# This is automagically enabled when HAVE_SHARED is true
-DOPIC = false
-
-# Enable support for shared libraries?  If this is false, you can
-# ignore all the rest of the options in this file...
-HAVE_SHARED = false
-
-# uClibc has a native shared library loader for some architectures.
-BUILD_UCLIBC_LDSO=false
-
-# If you are using shared libraries, but do not want/have a native
-# uClibc shared library loader, please specify the name of your
-# system's shared library loader here...
-#SYSTEM_LDSO=/lib/ld-linux.so.2
-
-# When using shared libraries, this path is the location where the
-# shared library will be invoked.  This value will be compiled into
-# every binary compiled with uClibc.  
-#
-# BIG FAT WARNING:  
-# If you do not have a shared library loader with the correct name
-# sitting in the directory this points to, your binaries will not run.
-SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
-
-# DEVEL_PREFIX is the directory into which the uClibc development
-# environment will be installed.   The result will look something 
-# like the following:
-#   DEVEL_PREFIX/
-#	bin/            <contains gcc, ld, etc>
-#	lib/            <contains all runtime and static libs>
-#	include/        <Where all the header files go>
-# This value is used by the 'make install' Makefile target.  Since this
-# directory is compiled into the uclibc cross compiler spoofer, you
-# have to recompile if you change this value...
-DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
-
-# SYSTEM_DEVEL_PREFIX is the directory prefix used when installing
-# bin/arch-uclibc-gcc, bin/arch-uclibc-ld, etc.   This is only used by
-# the 'make install' target, and is not compiled into anything.  This
-# defaults to $DEVEL_PREFIX/usr, but makers of .rpms and .debs will
-# want to set this to "/usr" instead.
-SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)/usr
-
-# If you want 'make install' to install everything under a temporary
-# directory, the define PREFIX during the install step,
-# i.e., 'make PREFIX=/var/tmp/uClibc install'.
-#PREFIX = $(TOPDIR)/_install
diff --git a/libc/sysdeps/linux/Makefile b/libc/sysdeps/linux/Makefile
index 751342782..5c6842ce5 100644
--- a/libc/sysdeps/linux/Makefile
+++ b/libc/sysdeps/linux/Makefile
@@ -25,7 +25,7 @@ TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
 DIRS = common $(TARGET_ARCH)
-ALL_SUBDIRS = arm common i386 m68k powerpc sh sparc 
+ALL_SUBDIRS = arm common h8300 i386 m68k mips powerpc sh sparc v850
 
 all: subdirs