about summary refs log tree commit diff
path: root/csu
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
commit3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch)
treedb47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /csu
parent1248c1c41508387ff282b208636737e8cdc9b5b0 (diff)
downloadglibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz
glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.xz
glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.zip
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'csu')
-rw-r--r--csu/Versions11
-rw-r--r--csu/init.c4
2 files changed, 2 insertions, 13 deletions
diff --git a/csu/Versions b/csu/Versions
index f0b4f00549..4ddf0d5b0b 100644
--- a/csu/Versions
+++ b/csu/Versions
@@ -4,23 +4,12 @@ libc {
   GLIBC_2.0 {
     # helper functions
     __libc_init_first; __libc_start_main;
-
-%if !HAVE___THREAD
-    # global variables
-    _errno;
-
-    # variables in normal name space
-    errno;
-%endif
   }
   GLIBC_2.1 {
     # New special glibc functions.
     gnu_get_libc_release; gnu_get_libc_version;
   }
   GLIBC_PRIVATE {
-%if HAVE___THREAD
-    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
     errno;
-%endif
   }
 }
diff --git a/csu/init.c b/csu/init.c
index 129609e084..559d13e647 100644
--- a/csu/init.c
+++ b/csu/init.c
@@ -1,5 +1,5 @@
 /* Special startup support.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#if defined USE_IN_LIBIO && defined __GNUC__ && __GNUC__ >= 2
+#if defined __GNUC__ && __GNUC__ >= 2
 
 #include <_G_config.h>