Commit fbd57629 authored by Zack Weinberg's avatar Zack Weinberg Committed by Linus Torvalds

uapi/linux/a.out.h: don't use deprecated system-specific predefines.

uapi/linux/a.out.h uses a number of predefined macros that are
deprecated because they're in the application namespace
(e.g. '#ifdef linux' instead of '#ifdef __linux__').
This patch either corrects or just removes them if they are not
applicable to Linux.

The primary reason this is worth bothering to fix, considering how
obsolete a.out binary support is, is that the GCC build process
considers this such a severe error that it will copy the header into a
private directory and change the macro names, which causes future
updates to the header to be masked.  This header probably doesn't get
updated very often anymore, but it is the _only_ uapi header that gets
this treatment, so IMHO it is worth patching just to drive that number
all the way to zero.
Signed-off-by: default avatarZack Weinberg <zackw@panix.com>
[hch: removed dead conditionals]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dbd18777
...@@ -112,24 +112,7 @@ enum machine_type { ...@@ -112,24 +112,7 @@ enum machine_type {
#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) #define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
#endif #endif
/* Address of data segment in memory after it is loaded. /* Address of data segment in memory after it is loaded. */
Note that it is up to you to define SEGMENT_SIZE
on machines not listed here. */
#if defined(vax) || defined(hp300) || defined(pyr)
#define SEGMENT_SIZE page_size
#endif
#ifdef sony
#define SEGMENT_SIZE 0x2000
#endif /* Sony. */
#ifdef is68k
#define SEGMENT_SIZE 0x20000
#endif
#if defined(m68k) && defined(PORTAR)
#define PAGE_SIZE 0x400
#define SEGMENT_SIZE PAGE_SIZE
#endif
#ifdef linux
#ifndef __KERNEL__ #ifndef __KERNEL__
#include <unistd.h> #include <unistd.h>
#endif #endif
...@@ -142,7 +125,6 @@ enum machine_type { ...@@ -142,7 +125,6 @@ enum machine_type {
#endif #endif
#endif #endif
#endif #endif
#endif
#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
...@@ -260,13 +242,7 @@ struct relocation_info ...@@ -260,13 +242,7 @@ struct relocation_info
unsigned int r_extern:1; unsigned int r_extern:1;
/* Four bits that aren't used, but when writing an object file /* Four bits that aren't used, but when writing an object file
it is desirable to clear them. */ it is desirable to clear them. */
#ifdef NS32K
unsigned r_bsr:1;
unsigned r_disp:1;
unsigned r_pad:2;
#else
unsigned int r_pad:4; unsigned int r_pad:4;
#endif
}; };
#endif /* no N_RELOCATION_INFO_DECLARED. */ #endif /* no N_RELOCATION_INFO_DECLARED. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment