From 3bd872c4c481664542c6c5797730f3830e827b92 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 1 Jun 2012 13:22:46 -0700 Subject: Use i386 sys/elf.h and sys/vm86.h for i386 and x86-64 --- sysdeps/unix/sysv/linux/i386/Makefile | 1 - sysdeps/unix/sysv/linux/i386/sys/elf.h | 29 ------------------------- sysdeps/unix/sysv/linux/i386/sys/vm86.h | 38 --------------------------------- sysdeps/unix/sysv/linux/x86/Makefile | 4 ++++ sysdeps/unix/sysv/linux/x86/sys/elf.h | 29 +++++++++++++++++++++++++ sysdeps/unix/sysv/linux/x86/sys/vm86.h | 38 +++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/Makefile | 1 - 7 files changed, 71 insertions(+), 69 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/i386/sys/elf.h delete mode 100644 sysdeps/unix/sysv/linux/i386/sys/vm86.h create mode 100644 sysdeps/unix/sysv/linux/x86/sys/elf.h create mode 100644 sysdeps/unix/sysv/linux/x86/sys/vm86.h (limited to 'sysdeps/unix/sysv') 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 - . */ - -#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 instead." - -# include -#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 - . */ - -#ifndef _SYS_VM86_H - -#define _SYS_VM86_H 1 -#include - -#ifdef __x86_64__ -# error This header is unsupported on x86-64. -#else -/* Get constants and data types from kernel header file. */ -# include - -__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 */ diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile index cf4a55cf0c..6412a9ef36 100644 --- a/sysdeps/unix/sysv/linux/x86/Makefile +++ b/sysdeps/unix/sysv/linux/x86/Makefile @@ -12,3 +12,7 @@ abi-64-ld-soname := ld-linux-x86-64.so.2 abi-x32-options := -U__i386__ -D__x86_64__ -D__ILP32__ -U__LP64__ abi-x32-condition := defined __x86_64__ && defined __ILP32__ abi-x32-ld-soname := ld-linux-x32.so.2 + +ifeq ($(subdir),misc) +sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h +endif diff --git a/sysdeps/unix/sysv/linux/x86/sys/elf.h b/sysdeps/unix/sysv/linux/x86/sys/elf.h new file mode 100644 index 0000000000..1f4524cba4 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/sys/elf.h @@ -0,0 +1,29 @@ +/* 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 + . */ + +#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 instead." + +# include +#endif + +#endif /* _SYS_ELF_H */ diff --git a/sysdeps/unix/sysv/linux/x86/sys/vm86.h b/sysdeps/unix/sysv/linux/x86/sys/vm86.h new file mode 100644 index 0000000000..c41b55d7b6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/sys/vm86.h @@ -0,0 +1,38 @@ +/* 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 + . */ + +#ifndef _SYS_VM86_H + +#define _SYS_VM86_H 1 +#include + +#ifdef __x86_64__ +# error This header is unsupported on x86-64. +#else +/* Get constants and data types from kernel header file. */ +# include + +__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 */ diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile index dd4ab59c5a..d6a9d360d1 100644 --- a/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),misc) sysdep_routines += ioperm iopl -sysdep_headers += sys/perm.h sys/reg.h sys/debugreg.h sys/io.h endif ifeq ($(subdir),stdlib) -- cgit 1.4.1