From 42bbb1c314c0ba4b947b3aae433d74a90b3b58a8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 May 2012 15:55:37 -0700 Subject: Add x86-64 support to i386 sys/elf.h and sys/vm86.h --- sysdeps/unix/sysv/linux/i386/sys/elf.h | 10 +++++++--- sysdeps/unix/sysv/linux/i386/sys/vm86.h | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/i386/sys/elf.h index 9d64e97688..1f4524cba4 100644 --- a/sysdeps/unix/sysv/linux/i386/sys/elf.h +++ b/sysdeps/unix/sysv/linux/i386/sys/elf.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* 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 @@ -18,8 +18,12 @@ #ifndef _SYS_ELF_H #define _SYS_ELF_H 1 -#warning "This header is obsolete; use instead." +#ifdef __x86_64__ +# error This header is unsupported on x86-64. +#else +# warning "This header is obsolete; use instead." -#include +# 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 index cd2ac07162..c41b55d7b6 100644 --- a/sysdeps/unix/sysv/linux/i386/sys/vm86.h +++ b/sysdeps/unix/sysv/linux/i386/sys/vm86.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1999, 2003 Free Software Foundation, Inc. +/* 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 @@ -20,8 +20,11 @@ #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 +# include __BEGIN_DECLS @@ -30,5 +33,6 @@ extern int vm86 (unsigned long int __subfunction, struct vm86plus_struct *__info) __THROW; __END_DECLS +# endif #endif /* _SYS_VM86_H */ -- cgit 1.4.1