Some combined cleaning up and arch-abstraction, involving UME and start-up:
- removed some assumptions that arch==x86 in Makefile.am files
- removed ume_arch.h; moved its contents into ume.h. There was no need for
these to be separate.
- moved ume_go.c into an x86/ subdir; gave it the more meaningful name
jmp_with_stack.c in the process (the corresponding function also got the name
change)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2757 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index e61bd1e..685d4a2 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -29,10 +29,11 @@
CLEANFILES = vg_toolint.c vg_toolint.h vg_replace_malloc.c vg_intercept.c
valgrind_SOURCES = \
- stage1.c \
ume.c \
- x86/ume_entry.S \
- x86/ume_go.c
+ ${VG_ARCH}/ume_entry.S \
+ \
+ stage1.c \
+ ${VG_ARCH}/jmp_with_stack.c
valgrind_DEPENDENCIES =
valgrind_LDFLAGS=-static -g -Wl,-e,_ume_entry
valgrind_LDADD=
@@ -45,7 +46,7 @@
stage2_SOURCES = \
ume.c \
- x86/ume_entry.S \
+ ${VG_ARCH}/ume_entry.S \
\
vg_scheduler.c \
vg_default.c \
@@ -141,7 +142,6 @@
core.h \
core_asm.h \
ume.h \
- ume_arch.h \
vg_symtab2.h \
vg_symtypes.h \
vg_toolint.h \