diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sys/elf.h | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sys/vm86.h | 8 |
3 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2012-05-31 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14117] + * sysdeps/unix/sysv/linux/i386/sys/elf.h: Error when compiling + for x86-64. + * sysdeps/unix/sysv/linux/i386/sys/vm86.h: Likewise. + 2012-05-31 Joseph Myers <joseph@codesourcery.com> * math/math.h (M_El): Use two more decimal places. diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/i386/sys/elf.h index 9d64e97..1f4524c 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 <sys/procfs.h> instead." +#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> +# 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 index cd2ac07..c41b55d 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 <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> +# include <asm/vm86.h> __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 */ |