aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Bucur <stefanb@zytor.com>2008-08-15 17:17:12 +0300
committerStefan Bucur <stefan@stefan-ubumac.(none)>2009-03-15 10:12:28 +0200
commit65d0f14a038176e5261729b2521c66d86440b631 (patch)
tree3c1f8b2bb634e35bf7be2b8240e7da39189cbec8
parent74e828897d9e0acfddd4119c1d227f68ab706df2 (diff)
downloadsyslinux-elf-65d0f14a038176e5261729b2521c66d86440b631.tar.gz
syslinux-elf-65d0f14a038176e5261729b2521c66d86440b631.tar.xz
syslinux-elf-65d0f14a038176e5261729b2521c66d86440b631.zip
Moved the execution layer API in klibc tree.
-rw-r--r--com32/elflink/Makefile4
-rw-r--r--com32/elflink/test_com32.c3
-rw-r--r--com32/include/sys/exec.h (renamed from com32/elflink/exec.h)0
-rw-r--r--com32/lib/Makefile3
-rw-r--r--com32/lib/sys/module/exec.c (renamed from com32/elflink/exec.c)3
5 files changed, 7 insertions, 6 deletions
diff --git a/com32/elflink/Makefile b/com32/elflink/Makefile
index 6f846d51..5691d66e 100644
--- a/com32/elflink/Makefile
+++ b/com32/elflink/Makefile
@@ -86,8 +86,8 @@ test_memalign.elf : test_memalign.o $(LIBS)
$(LD) $(LDFLAGS) -o $@ $^
test_com32.elf: CFLAGS += -DELF_DEBUG
-test_com32.elf: test_com32.o exec.o ../libutil/libutil_com.a ../lib/libcom32min.a $(LIBGCC)
- $(LD) -n $(LDFLAGS) -o $@ test_com32.o exec.o ../libutil/libutil_com.a $(LIBGCC) --whole-archive ../lib/libcom32min.a
+test_com32.elf: test_com32.o ../libutil/libutil_com.a ../lib/libcom32min.a $(LIBGCC)
+ $(LD) -n $(LDFLAGS) -o $@ test_com32.o ../libutil/libutil_com.a $(LIBGCC) --whole-archive ../lib/libcom32min.a
$(OBJCOPY) --extract-symbol $@ _root_.dyn
tidy dist:
diff --git a/com32/elflink/test_com32.c b/com32/elflink/test_com32.c
index c78962c4..60bbbed8 100644
--- a/com32/elflink/test_com32.c
+++ b/com32/elflink/test_com32.c
@@ -4,8 +4,7 @@
#include <string.h>
#include <sys/module.h>
-
-#include "exec.h"
+#include <sys/exec.h>
#define INFO_PRINT(fmt, args...) printf("[COM32] " fmt, ##args)
diff --git a/com32/elflink/exec.h b/com32/include/sys/exec.h
index e2be29b0..e2be29b0 100644
--- a/com32/elflink/exec.h
+++ b/com32/include/sys/exec.h
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 71bdab0e..0f541b85 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -51,7 +51,8 @@ LIBENTRY_OBJS = \
LIBMODULE_OBJS = \
sys/module/common.o sys/module/elf_module.o \
- sys/module/shallow_module.o sys/module/elfutils.o
+ sys/module/shallow_module.o sys/module/elfutils.o \
+ sys/module/exec.o
LIBSYSLINUX_OBJS = \
syslinux/idle.o syslinux/reboot.o \
diff --git a/com32/elflink/exec.c b/com32/lib/sys/module/exec.c
index a987c98c..025864bc 100644
--- a/com32/elflink/exec.c
+++ b/com32/lib/sys/module/exec.c
@@ -6,11 +6,12 @@
*/
#include <sys/module.h>
+#include <sys/exec.h>
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include "exec.h"
+
#define DBG_PRINT(fmt, args...) fprintf(stderr, "[EXEC] " fmt, ##args)