Use i386 sys/elf.h and sys/vm86.h for i386 and x86-64

3 files changed, 0 insertions, 68 deletions

diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index f4585d788a..acc30219e8 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -3,7 +3,6 @@ default-abi := 32
 
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl vm86 call_pselect6 call_fallocate
-sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
 endif
 
 ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/i386/sys/elf.h
deleted file mode 100644
index 1f4524cba4..0000000000
--- a/sysdeps/unix/sysv/linux/i386/sys/elf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1998-2012 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_ELF_H
-#define _SYS_ELF_H	1
-
-#ifdef __x86_64__
-# error This header is unsupported on x86-64.
-#else
-# warning "This header is obsolete; use <sys/procfs.h> instead."
-
-# include <sys/procfs.h>
-#endif
-
-#endif	/* _SYS_ELF_H */
diff --git a/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/sysdeps/unix/sysv/linux/i386/sys/vm86.h
deleted file mode 100644
index c41b55d7b6..0000000000
--- a/sysdeps/unix/sysv/linux/i386/sys/vm86.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1996-2012 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_VM86_H
-
-#define _SYS_VM86_H	1
-#include <features.h>
-
-#ifdef __x86_64__
-# error This header is unsupported on x86-64.
-#else
-/* Get constants and data types from kernel header file.  */
-# include <asm/vm86.h>
-
-__BEGIN_DECLS
-
-/* Enter virtual 8086 mode.  */
-extern int vm86 (unsigned long int __subfunction,
-		 struct vm86plus_struct *__info) __THROW;
-
-__END_DECLS
-# endif
-
-#endif	/* _SYS_VM86_H */