diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-31 15:57:54 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-31 15:57:54 -0700 |
| commit | 6bad24a091143db9804e58a716c0a7ed55eadea2 (patch) | |
| tree | 55854dc13544d11fb40c65e686cb09147d049293 | |
| parent | 42bbb1c314c0ba4b947b3aae433d74a90b3b58a8 (diff) | |
| download | glibc-6bad24a091143db9804e58a716c0a7ed55eadea2.tar glibc-6bad24a091143db9804e58a716c0a7ed55eadea2.tar.gz glibc-6bad24a091143db9804e58a716c0a7ed55eadea2.tar.bz2 glibc-6bad24a091143db9804e58a716c0a7ed55eadea2.zip | |
Use x86_64 bits/a.out.h for both i386 and x86_64
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/bits/a.out.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/a.out.h (renamed from sysdeps/unix/sysv/linux/x86_64/bits/a.out.h) | 0 |
3 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,10 @@ 2012-05-31 H.J. Lu <hongjiu.lu@intel.com> [BZ #14117] + * sysdeps/unix/sysv/linux/i386/bits/a.out.h: Removed. + * sysdeps/unix/sysv/linux/x86_64/bits/a.out.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/bits/a.out.h: This. + * sysdeps/unix/sysv/linux/i386/sys/elf.h: Error when compiling for x86-64. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: Likewise. diff --git a/sysdeps/unix/sysv/linux/i386/bits/a.out.h b/sysdeps/unix/sysv/linux/i386/bits/a.out.h deleted file mode 100644 index 0fb52c3815..0000000000 --- a/sysdeps/unix/sysv/linux/i386/bits/a.out.h +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef __A_OUT_GNU_H__ -# error "Never use <bits/a.out.h> directly; include <a.out.h> instead." -#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h b/sysdeps/unix/sysv/linux/x86/bits/a.out.h index 0e4a7c911f..0e4a7c911f 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h +++ b/sysdeps/unix/sysv/linux/x86/bits/a.out.h |