4 files changed, 18 insertions, 61 deletions
diff --git a/stdlib/Versions b/stdlib/Versions
index 6e92552794..9536e3240e 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -83,4 +83,11 @@ libc {
     # s*
     strtoimax; strtoumax; swapcontext;
   }
+  GLIBC_2.1.1 {
+    # _*
+    _Exit;
+
+    # i*
+    imaxabs; imaxdiv;
+  }
 }
diff --git a/stdlib/labs.c b/stdlib/labs.c
deleted file mode 100644
index 8c490c0312..0000000000
--- a/stdlib/labs.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1991, 1997 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
-   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.
-
-   The GNU C Library 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 the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <stdlib.h>
-
-#undef	labs
-
-
-/* Return the absolute value of I.  */
-long int
-labs (long int i)
-{
-  return i < 0 ? -i : i;
-}
diff --git a/stdlib/llabs.c b/stdlib/llabs.c
deleted file mode 100644
index 4d3576e1a1..0000000000
--- a/stdlib/llabs.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* `long long int' absolute value.
-   Copyright (C) 1991, 1996, 1997 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
-   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.
-
-   The GNU C Library 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 the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <stdlib.h>
-
-#undef	llabs
-
-
-/* Return the absolute value of I.  */
-long long int
-llabs (i)
-     long long int i;
-{
-  return i < 0 ? -i : i;
-}
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 3b9539e329..8a47b81ed9 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -45,19 +45,23 @@ typedef struct
   } div_t;
 
 /* Returned by `ldiv'.  */
+#ifndef __ldiv_t_defined
 typedef struct
   {
     long int quot;		/* Quotient.  */
     long int rem;		/* Remainder.  */
   } ldiv_t;
+# define __ldiv_t_defined	1
+#endif
 
-#ifdef __USE_ISOC9X
+#if defined __USE_ISOC9X && !defined __lldiv_t_defined
 /* Returned by `lldiv'.  */
 __extension__ typedef struct
   {
     long long int quot;		/* Quotient.  */
     long long int rem;		/* Remainder.  */
   } lldiv_t;
+# define __lldiv_t_defined	1
 #endif
 
 
@@ -515,6 +519,12 @@ extern int on_exit __P ((void (*__func) (int __status, __ptr_t __arg),
    perform stdio cleanup, and terminate program execution with STATUS.  */
 extern void exit __P ((int __status)) __attribute__ ((__noreturn__));
 
+#ifdef __USE_ISOC9X
+/* Terminate the program with STATUS without calling any of the
+   functions registered with `atexit' or `on_exit'.  */
+extern void _Exit __P ((int __status)) __attribute__ ((__noreturn__));
+#endif
+
 
 /* Return the value of envariable NAME, or NULL if it doesn't exist.  */
 extern char *getenv __P ((__const char *__name));