2006-10-06 17:14:27

by Joseph Myers

[permalink] [raw]
Subject: [PATCH] Remove "#ifdef linux" from linux/a.out.h

The <linux/a.out.h> header contains "#ifdef linux". GCC's fixincludes
then creates its own copy of the installed header with this changed to
"#ifdef __linux__". There should be no need for "#ifdef linux" in
Linux kernel headers, so this patch removes the conditional. With
this patch, fixincludes (from GCC 4.1) makes no changes to the headers
installed by "make headers_install" on MIPS (I haven't tested on other
architectures).

Signed-off-by: Joseph Myers <[email protected]>
---
Index: include/linux/a.out.h
===================================================================
--- include/linux/a.out.h
+++ include/linux/a.out.h
@@ -127,7 +127,6 @@
#define SEGMENT_SIZE PAGE_SIZE
#endif

-#ifdef linux
#include <asm/page.h>
#if defined(__i386__) || defined(__mc68000__)
#define SEGMENT_SIZE 1024
@@ -136,7 +135,6 @@
#define SEGMENT_SIZE PAGE_SIZE
#endif
#endif
-#endif

#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)




--
Joseph S. Myers
[email protected]