[klibc] ia64 mis-merge

[Martin Hicks]

Peter,

There was a mis-merge in the ia64 patch you put into 0.83.  Olaf Hering
pointed it out.  The patch is attached.  Olaf claims that he is still
unable to compile for ia64 with is toolchain.  He's getting the
following error:

<olh> libc.so(.got+0x0): multiple definition of `_GLOBAL_OFFSET_TABLE_'
<olh> tests/getenvtest.o(.got.plt+0x0): first defined here
<olh> make[2]: *** [tests/getenvtest.shared] Error 1

mh

-- 
Martin Hicks                Wild Open Source Inc.
mort at wildopensource.com     613-266-2296


diff -uNr klibc-0.83.vanilla/klibc/arch/ia64/Makefile.inc klibc-0.83/klibc/arch/ia64/Makefile.inc
--- klibc-0.83.vanilla/klibc/arch/ia64/Makefile.inc	2003-11-23 19:37:05.000000000 -0500
+++ klibc-0.83/klibc/arch/ia64/Makefile.inc	2003-11-24 08:38:30.111959378 -0500
@@ -8,7 +8,6 @@
 #
 
 ARCHOBJS = \
-	arch/$(ARCH)/sigjmp.o \
 	arch/$(ARCH)/vfork.o \
 	arch/$(ARCH)/setjmp.o
 
diff -uNr klibc-0.83.vanilla/klibc/arch/ia64/sigjmp.c klibc-0.83/klibc/arch/ia64/sigjmp.c
--- klibc-0.83.vanilla/klibc/arch/ia64/sigjmp.c	2003-11-23 19:37:05.000000000 -0500
+++ klibc-0.83/klibc/arch/ia64/sigjmp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-
-#include <setjmp.h>
-
-int __sigjmp_save (sigjmp_buf env, int savemask __attribute__ ((unused)))
-{
-  env[0].__mask_was_saved = 0;
-  return 0;
-}