diff options
| author | Ian Lynagh <igloo@earth.li> | 2006-10-12 01:39:01 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2006-10-12 01:39:01 +0000 |
| commit | 8c2549461d624ad5cfec9be3266bdfd016371658 (patch) | |
| tree | 3e4b0c8f4cdf6eabc6b70091bf42cb8f8e800be1 /includes/Makefile | |
| parent | ab22f4e6456820c1b5169d75f5975a94e61f54ce (diff) | |
| download | haskell-8c2549461d624ad5cfec9be3266bdfd016371658.tar.gz | |
Partially fix GHCi when unregisterised
We were constructing info tables designed for TABLES_NEXT_TO_CODE,
but were building without TABLES_NEXT_TO_CODE.
This patch also fixes a bug when we are unregisterised on amd64 and
have code with an address above 2^32.
Diffstat (limited to 'includes/Makefile')
| -rw-r--r-- | includes/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/includes/Makefile b/includes/Makefile index a181c23323..b1c57f9d01 100644 --- a/includes/Makefile +++ b/includes/Makefile @@ -9,10 +9,18 @@ include $(TOP)/mk/boilerplate.mk H_FILES = $(filter-out gmp.h,$(wildcard *.h)) gmp.h # -# Options -- if we're building unregisterised, add a couple of -D's +# Options # -ifeq "$(GhcUnregisterised)" "YES" -SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER +ifeq "$(GhcWithNoRegs)" "YES" +SRC_CC_OPTS += -DNO_REGS +endif + +ifeq "$(GhcWithMiniInterpreter)" "YES" +SRC_CC_OPTS += -DUSE_MINIINTERPRETER +endif + +ifeq "$(GhcWithTablesNextToCode)" "YES" +SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE endif SRC_CC_OPTS += -I. -I../rts |