diff -r 021546adce69 -r 0949a87e1629 config/libc/glibc.in
--- a/config/libc/glibc.in	Tue Jul 22 13:29:08 2008 +0000
+++ b/config/libc/glibc.in	Tue Aug 26 16:47:47 2008 +0000
@@ -58,36 +58,10 @@
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
-config LIBC_GLIBC_EXTRA_CONFIG
-    string
-    prompt "glibc extra config"
-    default ""
-    help
-      Extra flags to pass onto ./configure when configuring glibc.
-
-      Eg.: --enable-static-nss
-
-config LIBC_GLIBC_EXTRA_CFLAGS
-    string
-    prompt "glibc extra target CFLAGS"
-    default ""
-    help
-      Extra target CFLAGS to use when building glibc.
-
-config LIBC_EXTRA_CC_ARGS
-    string
-    prompt "gcc extra flags"
-    default ""
-    help
-      Extra flags to pass gcc when building glibc.
-
-      Seldom used, except for sparc64 which seems to need the flag -64
-      to be passed onto gcc.
-
 # Please note: This is not used for now (no sh support).
 config LIBC_GLIBC_CONFIGPARMS
     string
-    prompt "Extra config params (READ HELP)"
+#    prompt "Extra config params (READ HELP)"
     default "" if ARCH != "sh3" && ARCH != "sh4"
     default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4"
     help
@@ -100,37 +74,4 @@
       Note: this is awkward, doesn't work well if you need more than one
             line in configparms
 
-config LIBC_GLIBC_USE_PORTS
-    bool
-    prompt "Use the ports addon"
-    default n
-    help
-      The ports addon contains some architecture ports that are not available
-      in the official glibc distribution.
-      
-      For example, this is the case for ARM with glibc >= 2.4
-      
-      Say n only if you're sure that your architecture is in the official
-      glibc distribution for your chosen version.
-
-config LIBC_ADDONS
-    bool
-    prompt "Pass extra addons list"
-    default n
-    help
-      If you say Y here, you'll be able to give the list of addons you want to
-      include in your C library.
-
-config LIBC_ADDONS_LIST
-    string
-    prompt "Extra addons"
-    default ""
-    depends on LIBC_ADDONS
-    help
-      Extra addons to include in glibc. Space separated list.
-
-      You need to specify neither linuxthreads nor nptl, as they are added
-      automagically for you depending on the threading model you choosed
-      earlier.
-      
-      Eg.: crypt        (for very old glibces)
+source config/libc/glibc-eglibc-common.in