Feeding 'as' through 'gcc' allows us to use preprocessing macros and
other nice things in *.S files.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munte...@linux360.ro>
---
 Makefile              |    3 +--
 scripts/build/test.mk |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 70ea284..6741afc 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ OBJS = $(JAMVM_OBJS) $(JATO_OBJS)
 RUNTIME_CLASSES = \
        runtime/classpath/gnu/classpath/VMSystemProperties.class
 
-AS             := as
 CC             := gcc
 MONOBURG       := ./monoburg/monoburg
 JAVAC          := ecj
@@ -184,7 +183,7 @@ monoburg:
 
 %.o: %.S
        $(E) "  AS      " $@
-       $(Q) $(AS) $(AFLAGS) $< -o $@
+       $(Q) $(CC) -c $(DEFAULT_CFLAGS) $(CFLAGS) $< -o $@
 
 arch/$(ARCH)/insn-selector$(ARCH_POSTFIX).c: monoburg FORCE
        $(E) "  MONOBURG" $@
diff --git a/scripts/build/test.mk b/scripts/build/test.mk
index 4d60271..e5033a6 100644
--- a/scripts/build/test.mk
+++ b/scripts/build/test.mk
@@ -19,7 +19,7 @@ endif
 
 %.o: %.S
        $(E) "  AS      " $@
-       $(Q) $(AS) $(AFLAGS) $< -o `echo $@ | sed "s\/\-\g" | sed 
"s\[.][.]\p\g"`
+       $(Q) $(CC) $(ARCH_CFLAGS) $(DEFAULT_CFLAGS) $(CFLAGS) $(INCLUDE) 
$(DEFINES) -c $< -o `echo $@ | sed "s\/\-\g" | sed "s\[.][.]\p\g"`
 
 test: $(RUNNER)
 
-- 
1.6.0.6


------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel

Reply via email to