ifneq "$(findstring debug, $(way))" ""
GhcRtsHcOpts=
-GhcRtsCcOpts=-g
+GhcRtsCcOpts=-g -O0
endif
# -----------------------------------------------------------------------------
NON_HS_PACKAGE = YES
# grab sources from these subdirectories
-ALL_DIRS = hooks parallel
+ALL_DIRS = hooks parallel sm
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
ALL_DIRS += win32
# gcc provides lots of useful warnings if you ask it.
# This is a pretty good list to start with - use a # to comment out
# any you don't like.
-WARNING_OPTS += -Wall
+WARNING_OPTS += -Wall
WARNING_OPTS += -W
WARNING_OPTS += -Wstrict-prototypes
WARNING_OPTS += -Wmissing-prototypes
WARNING_OPTS += -Winline
WARNING_OPTS += -Waggregate-return
#WARNING_OPTS += -Wpointer-arith
-WARNING_OPTS += -Wbad-function-cast
+#WARNING_OPTS += -Wbad-function-cast
#WARNING_OPTS += -Wcast-align
#WARNING_OPTS += -Wnested-externs
#WARNING_OPTS += -Wshadow
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
-STANDARD_OPTS += -I../includes -I. -Iparallel
+STANDARD_OPTS += -I../includes -I. -Iparallel -Ism
# COMPILING_RTS is only used when building Win32 DLL support.
STANDARD_OPTS += -DCOMPILING_RTS
SRC_HC_OPTS += -optc-DNOSMP
endif
-ifeq "$(GhcWithTablesNextToCode)" "YES"
-SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
-SRC_HC_OPTS += -optc-DTABLES_NEXT_TO_CODE
-endif
-
ifneq "$(DLLized)" "YES"
SRC_HC_OPTS += -static
endif
PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
endif
+ifeq "$(GhciWithDebugger)" "YES"
+STANDARD_OPTS += -DDEBUGGER
+endif
+
ifeq "$(DotnetSupport)" "YES"
#
endif
#-----------------------------------------------------------------------------
+# Add PAPI library if needed
+
+ifeq "$(GhcRtsWithPapi)" "YES"
+SRC_HC_OPTS += -optc-DUSE_PAPI
+PACKAGE_CPP_OPTS += -DUSE_PAPI
+endif
+
+#-----------------------------------------------------------------------------
# make depend setup
SRC_MKDEPENDC_OPTS += -I. -I../includes
# We want a slightly different version for the unregisterised way, so we make
# AutoApply on a per-way basis (eg. AutoApply_p.cmm).
+ifneq "$(DOING_BIN_DIST)" "YES"
+
AUTO_APPLY_CMM = AutoApply$(_way).cmm
ifneq "$(BootingFromHc)" "YES"
CLEAN_FILES += $(AUTO_APPLY_CMM)
+endif
+
# -----------------------------------------------------------------------------
#
# Building DLLs is only supported on mingw32 at the moment.
if [ -f gmp/config.status ]; then \
cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
else \
- cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
+ cd gmp && CC=$(WhatGccIsCalled) $(SHELL) configure --enable-shared=no \
--host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \
fi
CLEAN_FILES += gmp/libgmp.a
+# Need to get the GMP vars in through CPP to package.conf.in, and put
+# quotes around each element.
+
+empty =
+space = $(empty) $(empty)
+comma = ,
+PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
+PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
+
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
+endif
+ifneq "$(GMP_LIB_DIRS)" ""
+SRC_LD_OPTS += -L$(GMP_LIB_DIRS)
+endif
+
#-----------------------------------------------------------------------------
#
# Building the GUM SysMan
endif
# -O3 helps unroll some loops (especially in copy() with a constant argument).
-GC_HC_OPTS += -optc-O3
+sm/Evac_HC_OPTS += -optc-funroll-loops
# Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
-GCCompact_HC_OPTS += -optc-finline-limit=2500
+sm/Compact_HC_OPTS += -optc-finline-limit=2500
# -fno-strict-aliasing is required for the runtime, because we often
# use a variety of types to represent closure pointers (StgPtr,
#
# Just libHSrts is installed uniformly across ways
#
-INSTALL_LIBS += $(LIBRARY)
ifeq "$(DLLized)" "YES"
-INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY))
+INSTALL_PROGS += gmp/gmp.dll
INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
endif
+#-----------------------------------------------------------------------------
+#
+# binary-dist
+
include $(TOP)/mk/target.mk
+
+binary-dist:
+ $(INSTALL_DIR) $(BIN_DIST_DIR)/rts
+ $(INSTALL_DIR) $(BIN_DIST_DIR)/rts/gmp
+ $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/rts/
+ $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/rts/
+ifneq "$(INSTALL_LIBS)" ""
+ $(INSTALL_DATA) $(INSTALL_LIBS) $(BIN_DIST_DIR)/rts/
+endif
+ifneq "$(INSTALL_LIBEXECS)" ""
+ $(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/
+endif