com32: remove setjmp.S stub file

Compile setjmp.S directly out of the $(ARCH) directory.

Signed-off-by: H. Peter Anvin <[email protected]>

diff --git a/com32/lib/setjmp.S b/com32/lib/setjmp.S
deleted file mode 100644 (file)
index ac047dd..0000000
--- a/com32/lib/setjmp.S
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef __i386__
-#include <i386/setjmp.S>
-#elif defined(__x86_64__)
-#include <x86_64/setjmp.S>
-#else
-#error "Unable to build for to-be-defined architecture type"
-#endif
-

diff --git a/mk/lib.mk b/mk/lib.mk
index deb2c19..1a232d7 100644 (file)
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -188,7 +188,7 @@ MINLIBOBJS = \
 CORELIBOBJS = \
        memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o        \
        strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o      \
-       strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o     \
+       strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o      \
        strtoul.o strntoumax.o strcasecmp.o                             \
        sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o   \
        fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o           \
@@ -196,6 +196,7 @@ CORELIBOBJS = \
        sys/stdcon_write.o                                              \
        syslinux/memscan.o strrchr.o strcat.o                           \
        syslinux/debug.o                                                \
+       $(ARCH)/setjmp.o                                                \
        $(LIBGCC_OBJS) \
        $(LIBENTRY_OBJS) \
        $(LIBMODULE_OBJS)