about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/i386
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-31 15:55:37 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-31 15:55:37 -0700
commit42bbb1c314c0ba4b947b3aae433d74a90b3b58a8 (patch)
tree24dafca7287e3cb5f6cdd039ec5bd496c08a88aa /sysdeps/unix/sysv/linux/i386
parent2d10d547c1e41138e439d74105246eca31547693 (diff)
downloadglibc-42bbb1c314c0ba4b947b3aae433d74a90b3b58a8.tar.gz
glibc-42bbb1c314c0ba4b947b3aae433d74a90b3b58a8.tar.xz
glibc-42bbb1c314c0ba4b947b3aae433d74a90b3b58a8.zip
Add x86-64 support to i386 sys/elf.h and sys/vm86.h
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
-rw-r--r--sysdeps/unix/sysv/linux/i386/sys/elf.h10
-rw-r--r--sysdeps/unix/sysv/linux/i386/sys/vm86.h8
2 files changed, 13 insertions, 5 deletions
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 <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 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 <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 */