Update my email address. I am no longer andersen@lineo.com

13 files changed, 73 insertions, 35 deletions

diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 84df57da4..d68a3e2a5 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index 636574d32..5058c4e59 100644
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index 5a4f4be75..12f2bb929 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
@@ -45,7 +46,7 @@ STRIPTOOL = $(CROSS)strip
 
 # Set the following to `true' to make a debuggable build, and `false' for
 # production builds.
-DODEBUG = false
+DODEBUG = true
 
 # Compiler warnings you want to see 
 WARNINGS=-Wall
@@ -114,19 +115,19 @@ UNIFIED_SYSCALL = false
 # If you want large file summit support (greater then 2 Gib), 
 # turn this on.  This has no effect unless your kernel supports 
 # lfs.  This currently does nothing, but may someday...
-DOLFS = false
+DOLFS = 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
+INCLUDE_RPC = true
 
 # 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 compile the library as PIC code, turn this on.
-DOPIC = false
+DOPIC = true
 
 
 
diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index 77fc37816..1ebe7b097 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index 6d9dc5a52..c45243315 100644
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index e17d41f97..817a6083a 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index e17d41f97..817a6083a 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 90bd41cae..7022dfd45 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 580161be6..5b5645727 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -1,8 +1,8 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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) 2001 by Hewlett-Packard Australia
diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index 4c80cad65..a519f2577 100644
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -1,10 +1,11 @@
 # Library Configuration rules for uClibc
 #
-# This file contains rules which are shared between multiple Makefiles.  Feel
-# free to adjust to taste...  
-#  -Erik Andersen <andersen@lineo.com> <andersee@debian.org>
+# 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, 2001 by Lineo, inc.
+# 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
diff --git a/extra/Makefile b/extra/Makefile
index fa4b50b44..14ce2d5ed 100644
--- a/extra/Makefile
+++ b/extra/Makefile
@@ -1,6 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
+# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.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
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index b27d440fb..6a6773b6a 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -1,3 +1,9 @@
+# Makefile for building a fake gcc/binutils toolchain
+# that simply spoofs the location of the C library
+#
+# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+#
+
 TOPDIR = ../../
 include $(TOPDIR)Rules.mak
 
diff --git a/extra/gcc-uClibc/gcc-uClibc.c b/extra/gcc-uClibc/gcc-uClibc.c
index fc3a58dd7..3dc93b41e 100644
--- a/extra/gcc-uClibc/gcc-uClibc.c
+++ b/extra/gcc-uClibc/gcc-uClibc.c
@@ -207,15 +207,34 @@ int main(int argc, char **argv)
 			use_build_dir = 1;
 		} else if (strcmp("--uclibc-use-rpath",argv[j]) == 0) {
 			use_rpath = 1;
+		}
+#if 0
 		} else {
 			gcc_argv[i++] = argv[j];
 		}
+#endif	
+	}
+	if (linking && source_count) {
+		if (use_start) {
+			gcc_argv[i++] = crt0_path[use_build_dir];
+			gcc_argv[i++] = "-e _start";
+		}
 	}
+
+
 	if (use_stdinc) {
 		gcc_argv[i++] = nostdinc;
 		gcc_argv[i++] = uClibc_inc[use_build_dir];
 		gcc_argv[i++] = GCC_INCDIR;
 	}
+
+	for ( j = 1 ; j < argc ; j++ ) {
+		if (strcmp("--uclibc-use-build-dir",argv[j]) != 0 && 
+		    strcmp("--uclibc-use-rpath",argv[j]) != 0) {
+			gcc_argv[i++] = argv[j];
+		}
+	}
+
 	if (linking && source_count) {
 		if (!use_static_linking) {
 			if (dlstr && use_build_dir) {
@@ -232,9 +251,12 @@ int main(int argc, char **argv)
 		if (!use_build_dir) {
 			gcc_argv[i++] = usr_lib_path;
 		}
+#if 0
 		if (use_start) {
+			gcc_argv[i++] = "-e _start";
 			gcc_argv[i++] = crt0_path[use_build_dir];
 		}
+#endif
 		if (use_stdlib) {
 			gcc_argv[i++] = nostdlib;
 			gcc_argv[i++] = "-lc";