Reworked the build system for linux.

diff --git a/rex/unix/Makefile b/rex/unix/Makefile
index b615bea..9b94efd 100644 (file)
--- a/rex/unix/Makefile
+++ b/rex/unix/Makefile
@@ -24,9 +24,10 @@ else
 all: $(LIB_TARGET)
 endif
 
+-include $(OUTDIR)/*.d
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(LIB_TARGET): $(OBJECTS) | $(OUTDIR)
        $(AR) -cr $@ $^

diff --git a/rexcc/unix/Makefile b/rexcc/unix/Makefile
index 03ecede..7da7d3c 100644 (file)
--- a/rexcc/unix/Makefile
+++ b/rexcc/unix/Makefile
@@ -20,10 +20,12 @@ vpath %.c ../
 OBJECTS += $(addprefix $(OUTDIR)/, $(patsubst %.c,%.o,$(notdir $(wildcard *.c))))
 vpath %.c .
 
+-include $(OUTDIR)/*.d
+
 all: $(EXE_TARGET)
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(EXE_TARGET): $(OBJECTS) | $(OUTDIR)
        $(CC) -o $@ $^ $(LDFLAGS)

diff --git a/rexgrep/unix/Makefile b/rexgrep/unix/Makefile
index ee59492..65af6c9 100644 (file)
--- a/rexgrep/unix/Makefile
+++ b/rexgrep/unix/Makefile
@@ -21,10 +21,12 @@ vpath %.c ../
 OBJECTS += $(addprefix $(OUTDIR)/, $(patsubst %.c,%.o,$(notdir $(wildcard *.c))))
 vpath %.c .
 
+-include $(OUTDIR)/*.d
+
 all: $(EXE_TARGET)
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(EXE_TARGET): $(OBJECTS) | $(OUTDIR)
        $(CC) -o $@ $^ $(LDFLAGS)

diff --git a/rjs/unix/Makefile b/rjs/unix/Makefile
index 22d41bb..ed2f831 100644 (file)
--- a/rjs/unix/Makefile
+++ b/rjs/unix/Makefile
@@ -32,6 +32,7 @@ vpath %.c .
 OBJECTS += $(OUTDIR)/ecma262.o
 RJSEXEC_OBJECTS = $(OUTDIR)/rjsexec.o \
 
+-include $(OUTDIR)/*.d
 
 ifeq ($(OS), linux)
 all: $(LIB_TARGET) $(SO_TARGET) $(EXE_TARGET)
@@ -43,10 +44,10 @@ $(EXE_TARGET) : $(RJSEXEC_OBJECTS)
        $(CC) -o $@ $^ $(LDFLAGS) -static
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(OUTDIR)/%.o: ../exec/%.c | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(LIB_TARGET): $(OBJECTS) | $(OUTDIR)
        $(AR) -cr $@ $^

diff --git a/rlib/unix/Makefile b/rlib/unix/Makefile
index 2469d08..2c6780d 100644 (file)
--- a/rlib/unix/Makefile
+++ b/rlib/unix/Makefile
@@ -25,9 +25,10 @@ else
 all: $(LIB_TARGET)
 endif
 
+-include $(OUTDIR)/*.d
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(LIB_TARGET): $(OBJECTS) | $(OUTDIR)
        $(AR) -cr $@ $^

diff --git a/rpa/unix/Makefile b/rpa/unix/Makefile
index a7ef2b7..f4ceada 100644 (file)
--- a/rpa/unix/Makefile
+++ b/rpa/unix/Makefile
@@ -27,9 +27,10 @@ else
 all: $(LIB_TARGET)
 endif
 
+-include $(OUTDIR)/*.d
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(LIB_TARGET): $(OBJECTS) | $(OUTDIR)
        $(AR) -cr $@ $^

diff --git a/rpagrep/unix/Makefile b/rpagrep/unix/Makefile
index 748a780..daad681 100644 (file)
--- a/rpagrep/unix/Makefile
+++ b/rpagrep/unix/Makefile
@@ -24,10 +24,12 @@ vpath %.c ../
 OBJECTS += $(addprefix $(OUTDIR)/, $(patsubst %.c,%.o,$(notdir $(wildcard *.c))))
 vpath %.c .
 
+-include $(OUTDIR)/*.d
+
 all: $(EXE_TARGET)
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(EXE_TARGET): $(OBJECTS) | $(OUTDIR)
        $(CC) -o $@ $^ $(LDFLAGS)

diff --git a/rvm/rvmcpu.h b/rvm/rvmcpu.h
index 0174b44..26fe889 100644 (file)
--- a/rvm/rvmcpu.h
+++ b/rvm/rvmcpu.h
@@ -480,14 +480,6 @@ typedef struct rvm_optable_s {
 } rvm_optable_t;
 
 
-#define RVM_CEXEC_NAN 0
-#define RVM_CEXEC_GRE 1
-#define RVM_CEXEC_GEQ 2
-#define RVM_CEXEC_EQ  3
-#define RVM_CEXEC_NEQ 4
-#define RVM_CEXEC_LEQ 5
-#define RVM_CEXEC_LES 6
-
 struct rvm_asmins_s {
        rvmreg_t data;
        ruint16 op1:RVM_OPERAND_BITS;

diff --git a/rvm/unix/Makefile b/rvm/unix/Makefile
index eb177f6..e6618f9 100644 (file)
--- a/rvm/unix/Makefile
+++ b/rvm/unix/Makefile
@@ -26,9 +26,10 @@ else
 all: $(LIB_TARGET)
 endif
 
+-include $(OUTDIR)/*.d
 
 $(OUTDIR)/%.o: %.c Makefile | $(OUTDIR)
-       $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(OUTDIR)/$(notdir $(<:.c=.lst)) $< -o $@
+       $(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) $< -o $@
 
 $(LIB_TARGET): $(OBJECTS) | $(OUTDIR)
        $(AR) -cr $@ $^

diff --git a/tests/testmisc/unix/Makefile b/tests/testmisc/unix/Makefile
index c2fb24e..472a502 100644 (file)
--- a/tests/testmisc/unix/Makefile
+++ b/tests/testmisc/unix/Makefile
@@ -57,10 +57,12 @@ ETESTS   += $(OUTDIR)/string-test
 ETESTS   += $(OUTDIR)/opmap-test
 ETESTS   += $(OUTDIR)/asm-cast
 
+-include $(OUTDIR)/*.d
+
 all: $(TESTS)
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c Makefile | bin
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(LDFLAGS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(LDFLAGS) $(INCLUDE)
 
 $(OUTDIR):
        mkdir $@                

diff --git a/tests/testrex/unix/Makefile b/tests/testrex/unix/Makefile
index e448be5..970492c 100644 (file)
--- a/tests/testrex/unix/Makefile
+++ b/tests/testrex/unix/Makefile
@@ -19,6 +19,7 @@ ifeq ($(OS), linux)
 LDFLAGS += --static
 endif
 
+-include $(OUTDIR)/*.d
 
 TESTS  += $(OUTDIR)/main
 TESTS  += $(OUTDIR)/rexregex
@@ -26,7 +27,7 @@ TESTS += $(OUTDIR)/rexregex
 all: $(TESTS)
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c Makefile | bin
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LDFLAGS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LDFLAGS) $(INCLUDE)
 
 $(OUTDIR):
        mkdir $@                

diff --git a/tests/testrjs/unix/Makefile b/tests/testrjs/unix/Makefile
index c804e48..beba741 100644 (file)
--- a/tests/testrjs/unix/Makefile
+++ b/tests/testrjs/unix/Makefile
@@ -37,11 +37,12 @@ vpath %.c .
 TESTS   += $(OUTDIR)/rjs-simple
 TESTS   += $(OUTDIR)/rjs-args
 
+-include $(OUTDIR)/*.d
 
 all: $(TESTS)
 
 $(OUTDIR)/%: $(TESTS_SRCDIR)/%.c Makefile | bin
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(LDFLAGS) $(INCLUDE)
+       + $(CC) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(LDFLAGS) $(INCLUDE)
 
 $(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa
        $(LD) -r -b binary -o $(OUTDIR)/$*.o $(TESTS_SRCDIR)/$*.rpa