patch-1.3.2 linux/include/linux/a.out.h

Next file: linux/include/linux/binfmts.h
Previous file: linux/include/asm-i386/types.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.1/linux/include/linux/a.out.h linux/include/linux/a.out.h
@@ -5,17 +5,7 @@
 
 #ifndef __STRUCT_EXEC_OVERRIDE__
 
-struct exec
-{
-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */
-  unsigned a_text;		/* length of text, in bytes */
-  unsigned a_data;		/* length of data, in bytes */
-  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;		/* length of symbol table data in file, in bytes */
-  unsigned a_entry;		/* start address */
-  unsigned a_trsize;		/* length of relocation info for text, in bytes */
-  unsigned a_drsize;		/* length of relocation info for data, in bytes */
-};
+#include <asm/a.out.h>
 
 #endif /* __STRUCT_EXEC_OVERRIDE__ */
 
@@ -137,7 +127,11 @@
 
 #ifdef linux
 #include <asm/page.h>
+#ifdef __i386__
 #define SEGMENT_SIZE	1024
+#else
+#define SEGMENT_SIZE	PAGE_SIZE
+#endif
 #endif
 
 #define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this