This renames test code files and alters the Makefile so that Jato can compile for x86-64 without encountering build errors.
Signed-off-by: Eduard - Gabriel Munteanu <[email protected]> --- scripts/build/test.mk | 8 +++++++- test/arch-x86/Makefile | 11 +++++++---- .../{emit-code-test.c => emit-code-test_32.c} | 0 ...nsn-selector-test.c => insn-selector-test_32.c} | 0 .../{stack-frame-test.c => stack-frame-test_32.c} | 0 .../arch-x86/{use-def-test.c => use-def-test_32.c} | 0 6 files changed, 14 insertions(+), 5 deletions(-) rename test/arch-x86/{emit-code-test.c => emit-code-test_32.c} (100%) rename test/arch-x86/{insn-selector-test.c => insn-selector-test_32.c} (100%) rename test/arch-x86/{stack-frame-test.c => stack-frame-test_32.c} (100%) rename test/arch-x86/{use-def-test.c => use-def-test_32.c} (100%) diff --git a/scripts/build/test.mk b/scripts/build/test.mk index d229723..03d46ab 100644 --- a/scripts/build/test.mk +++ b/scripts/build/test.mk @@ -4,6 +4,12 @@ CFLAGS ?= -rdynamic -g -Wall -Wundef -Wsign-compare -Os -std=gnu99 INCLUDE ?= -I../include/ -I. -I../libharness -I../../include -I../../jit/glib -include $(ARCH_CONFIG) LIBS ?= -lpthread -lm -ldl -lz -lbfd -lopcodes -liberty +ifdef TESTS + TESTS_C = $(TESTS:.o=.c) +else + TESTS_C = '*.c' +endif + %.o: %.c $(E) " CC " $@ $(Q) $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c $< -o `basename $...@` @@ -20,7 +26,7 @@ $(OBJS): FORCE $(SUITE): FORCE $(E) " SUITE " $@ - $(Q) sh ../../scripts/build/make-tests.sh *.c > $@ + $(Q) sh ../../scripts/build/make-tests.sh $(TESTS_C) > $@ clean: FORCE $(E) " CLEAN" diff --git a/test/arch-x86/Makefile b/test/arch-x86/Makefile index aba1a3b..855f2e6 100644 --- a/test/arch-x86/Makefile +++ b/test/arch-x86/Makefile @@ -46,10 +46,13 @@ OBJS = \ ../../arch/x86/insn-selector$(ARCH_POSTFIX).o \ ../../arch/x86/stack-frame.o \ ../../arch/x86/use-def.o \ - emit-code-test.o \ - insn-selector-test.o \ - stack-frame-test.o \ - use-def-test.o + $(TESTS) + +TESTS = \ + emit-code-test$(ARCH_POSTFIX).o \ + insn-selector-test$(ARCH_POSTFIX).o \ + stack-frame-test$(ARCH_POSTFIX).o \ + use-def-test$(ARCH_POSTFIX).o ../../arch/x86/insn-selector.c: FORCE $(E) " MONOBURG" $@ diff --git a/test/arch-x86/emit-code-test.c b/test/arch-x86/emit-code-test_32.c similarity index 100% rename from test/arch-x86/emit-code-test.c rename to test/arch-x86/emit-code-test_32.c diff --git a/test/arch-x86/insn-selector-test.c b/test/arch-x86/insn-selector-test_32.c similarity index 100% rename from test/arch-x86/insn-selector-test.c rename to test/arch-x86/insn-selector-test_32.c diff --git a/test/arch-x86/stack-frame-test.c b/test/arch-x86/stack-frame-test_32.c similarity index 100% rename from test/arch-x86/stack-frame-test.c rename to test/arch-x86/stack-frame-test_32.c diff --git a/test/arch-x86/use-def-test.c b/test/arch-x86/use-def-test_32.c similarity index 100% rename from test/arch-x86/use-def-test.c rename to test/arch-x86/use-def-test_32.c -- 1.6.0.6 ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Jatovm-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jatovm-devel
