commit 807b63b96df949811450086ff12b466dd007bdd1
author H. Peter Anvin <hpa@zytor.com> Mon Nov 24 20:09:35 2003 +0000
committer H. Peter Anvin <hpa@zytor.com> Mon Nov 24 20:09:35 2003 +0000
tree f844a5029c7d8d1fef9ac71a85f15ad219c9c4f1
parent 97851bcd0cd6696694ec35859ed46bb724400be4

Fix ia64 mismerge

klibc/arch/ia64/Makefile.inc

diff --git a/klibc/arch/ia64/Makefile.inc b/klibc/arch/ia64/Makefile.inc
index 1b65250..edf4345 100644
--- a/klibc/arch/ia64/Makefile.inc
+++ b/klibc/arch/ia64/Makefile.inc
@@ -8,7 +8,6 @@
 #
 
 ARCHOBJS = \
-	arch/$(ARCH)/sigjmp.o \
 	arch/$(ARCH)/vfork.o \
 	arch/$(ARCH)/setjmp.o
 

klibc/arch/ia64/sigjmp.c

diff --git a/klibc/arch/ia64/sigjmp.c b/klibc/arch/ia64/sigjmp.c
deleted file mode 100644
index cb7a8d3..0000000
--- a/klibc/arch/ia64/sigjmp.c
+++ /dev/null
@@ -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;
-}