better handling of no-dyngen cases in makefiles

This commit is contained in:
gbeauche 2005-01-10 22:50:54 +00:00
parent d075282607
commit fb3f855d29
2 changed files with 7 additions and 3 deletions

View File

@ -24,6 +24,7 @@ LIBS = @LIBS@
SYSSRCS = @SYSSRCS@
CPUSRCS = @CPUSRCS@
MONSRCS = @MONSRCS@
USE_DYNGEN = @USE_DYNGEN@
DYNGENSRCS = @DYNGENSRCS@
DYNGEN_CC = @DYNGEN_CC@
DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
@ -35,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
INSTALL_DATA = @INSTALL_DATA@
# Append disassembler to dyngen, if available
ifneq (:,$(MONSRCS):$(DYNGENSRCS))
ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
endif
@ -144,7 +145,7 @@ kpxsrcdir = ../kpx_cpu/src
GENEXEC = $(kpxsrcdir)/cpu/ppc/genexec.pl
DYNGEN = dyngen$(EXEEXT)
ifneq ($(DYNGENSRCS),)
ifeq ($(USE_DYNGEN),yes)
DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
$(DYNGEN): $(DYNGENOBJS)
@ -171,7 +172,7 @@ ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEP
# PowerPC CPU tester
TESTSRCS_ = mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
ifneq ($(DYNGENSRCS),)
ifeq ($(USE_DYNGEN),yes)
TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
endif
TESTSRCS = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)

View File

@ -1110,6 +1110,8 @@ if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
ac_cv_have_static_data_exec=no
)
])
else
ac_cv_use_dyngen=no
fi
AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
[Define if your system marks static data pages as executable.])
@ -1119,6 +1121,7 @@ if [[ "x$WANT_JIT" = "xyes" ]]; then
fi
dnl Generate Makefile.
AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
AC_SUBST(DYNGENSRCS)
AC_SUBST(DYNGEN_CC)
AC_SUBST(DYNGEN_OP_FLAGS)