diff options
author | H. Peter Anvin <hpa@zytor.com> | 2019-02-04 10:07:05 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2019-02-04 10:07:05 -0800 |
commit | 621770d33e6da95556ccfc4f08fd16edb8300c63 (patch) | |
tree | aeb0c14c790fc95f47a57566c79c4c6d3f8015f5 | |
parent | 729ae285595d313dfe0fa4eb339f95947c778630 (diff) | |
download | syslinux-621770d33e6da95556ccfc4f08fd16edb8300c63.tar.gz syslinux-621770d33e6da95556ccfc4f08fd16edb8300c63.tar.xz syslinux-621770d33e6da95556ccfc4f08fd16edb8300c63.zip |
com32: remove setjmp.S stub file
Compile setjmp.S directly out of the $(ARCH) directory.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | com32/lib/setjmp.S | 8 | ||||
-rw-r--r-- | mk/lib.mk | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/com32/lib/setjmp.S b/com32/lib/setjmp.S deleted file mode 100644 index ac047dda..00000000 --- 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 - @@ -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) |