4 files changed, 12 insertions, 112 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
deleted file mode 100644
index 76d295e048..0000000000
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-ifeq ($(subdir), misc)
-sysdep_routines := $(sysdep_routines) fpu_control setfpucw
-
-extra-libs := $(extra-libs) libieee
-libieee-routines := ieee_fpu
-libieee-inhibit-o := .so .po
-endif
diff --git a/sysdeps/unix/sysv/linux/i386/fpu_control.c b/sysdeps/unix/sysv/linux/i386/fpu_control.c
deleted file mode 100644
index b6840d0b17..0000000000
--- a/sysdeps/unix/sysv/linux/i386/fpu_control.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Default control word for ix86 FPU.
-Copyright (C) 1995 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.  */
-
-unsigned short __fpu_control = 0;
diff --git a/sysdeps/unix/sysv/linux/i386/fpu_control.h b/sysdeps/unix/sysv/linux/i386/fpu_control.h
index 8cf4292643..56f42cd8e6 100644
--- a/sysdeps/unix/sysv/linux/i386/fpu_control.h
+++ b/sysdeps/unix/sysv/linux/i386/fpu_control.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 Contributed by Olaf Flebbe.
 
@@ -87,13 +87,20 @@ Boston, MA 02111-1307, USA.  */
 /* IEEE:  same as above, but exceptions */
 #define _FPU_IEEE     0x137f
 
-/* private namespace. It should only be used in init-first.o. */
-extern unsigned short __fpu_control;
+/* Type of the control word.  */
+typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__)));
+
+/* Macros for accessing the hardware control word.  */
+#define _FPU_GETCW(cw) __asm__ ("fnstcw %0" : "=m" (cw))
+#define _FPU_SETCW(cw) __asm__ ("fldcw %0" : "m" (cw))
+
+/* Default control word set at startup.  */
+extern fpu_control_t __fpu_control;
 
 __BEGIN_DECLS
 
-/* called in init-first.o. It can be used to manipulate 387 control word. */
-extern void __setfpucw __P ((unsigned short));
+/* Called at startup.  It can be used to manipulate fpu control register.  */
+extern void __setfpucw __P ((fpu_control_t));
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/i386/init-first.c b/sysdeps/unix/sysv/linux/i386/init-first.c
deleted file mode 100644
index 9ee3f77ef5..0000000000
--- a/sysdeps/unix/sysv/linux/i386/init-first.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Initialization code run first thing by the ELF startup code.  i386/Linux
-Copyright (C) 1995 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <unistd.h>
-#include <sysdep.h>
-#include "fpu_control.h"
-
-extern void __libc_init (int, char **, char **);
-extern void __libc_global_ctors (void);
-
-
-static void
-init (int *data)
-{
-  int argc = *data;
-  char **argv = (void *) (data + 1);
-  char **envp = &argv[argc + 1];
-
-  /* Make sure we are not using the iBSC2 personality.  The `personality'
-     syscall takes one argument; zero means the Linux personality.  The
-     argument arrives in %ebx; we have to save and restore %ebx by hand
-     here, because GCC (as of 2.7.0) cannot handle saving and restoring it
-     for us when it is the dedicated GOT register for PIC.  */
-  asm ("pushl %%ebx\n"
-       "xorl %%ebx, %%ebx\n"
-       "int $0x80 # syscall no %0\n"
-       "popl %%ebx"
-       : : "a" (SYS_ify (personality)));
-
-  /* Set the FPU control word to the proper default value.  */
-  __setfpucw (__fpu_control);
-
-  __environ = envp;
-  __libc_init (argc, argv, envp);
-}
-
-#ifdef PIC
-/* This function is called to initialize the shared C library.
-   It is called just before the user _start code from i386/elf/start.S,
-   with the stack set up as that code gets it.  */
-
-/* NOTE!  The linker notices the magical name `_init' and sets the DT_INIT
-   pointer in the dynamic section based solely on that.  It is convention
-   for this function to be in the `.init' section, but the symbol name is
-   the only thing that really matters!!  */
-/*void _init (int argc, ...) __attribute__ ((unused, section (".init")));*/
-
-void
-_init (int argc, ...)
-{
-  init (&argc);
-
-  __libc_global_ctors ();
-}
-#endif
-
-
-void
-__libc_init_first (int argc __attribute__ ((unused)), ...)
-{
-#ifndef PIC
-  init (&argc);
-#endif
-}