2002-09-23  Michal Ludvig  <mludvig@suse.cz>
	Merged x86-64 port by Andi Kleen <ak@suse.de>
	and Michal Ludvig <mludvig@suse.cz>
	* Makefile.in: New target 'headers'. Failure ignored.
	* acconfig.h: New defines for x86-64.
	* configure.in: Ditto.
	* defs.h: Ditto.
	* file.c: Ditto.
	* signal.c: Ditto.
	* process.c: Added support for x86-64.
	* util.c: Ditto.
	* syscall.c: Ditto + added automatic personality switching.
	* linux/syscall.h: Ditto.
	* linux/x86_64: New directory.
	* linux/x86_64/Makefile.in: New file.
	* linux/x86_64/gentab.pl: Ditto.
	* linux/x86_64/i386-headers.diff: Ditto.
	* linux/x86_64/makeheaders.sh: Ditto.
	* linux/x86_64/syscallent.h: Ditto.
	* mem.c (print_mmap): Always print arg[4] as int.
diff --git a/signal.c b/signal.c
index 4c54bf0..5621795 100644
--- a/signal.c
+++ b/signal.c
@@ -83,7 +83,7 @@
 	struct regs		si_regs;
 	int			si_mask;
 } m_siginfo_t;
-#elif !defined(IA64)
+#elif !defined(IA64) && !defined(X86_64)
 #include <asm/sigcontext.h>
 #endif /* SPARC */
 #else /* !HAVE_ASM_SIGCONTEXT_H */
@@ -1357,10 +1357,9 @@
 	}
 	return 0;
 #else
-#ifdef HPPA
-#warning NO sys_sigreturn DECODE FOR HPPA
+#warning No sys_sigreturn() for this architecture
+#warning         (no problem, just a reminder :-)
 	return 0;
-#endif /* HPPA */
 #endif /* MIPS */
 #endif /* SPARC */
 #endif /* ALPHA */