Commit e53ba359 authored by Duncan Coutts's avatar Duncan Coutts

Stop building the rts against gmp

Nothing from gmp is used in the rts anymore.
parent 1b61c2db
...@@ -342,11 +342,6 @@ ...@@ -342,11 +342,6 @@
#include "Block.h" /* For Bdescr() */ #include "Block.h" /* For Bdescr() */
/* Can't think of a better place to put this. */
#if SIZEOF_mp_limb_t != SIZEOF_VOID_P
#error mp_limb_t != StgWord: assumptions in PrimOps.cmm are now false
#endif
#define MyCapability() (BaseReg - OFFSET_Capability_r) #define MyCapability() (BaseReg - OFFSET_Capability_r)
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
......
...@@ -175,13 +175,6 @@ TAG_CLOSURE(StgWord tag,StgClosure * p) ...@@ -175,13 +175,6 @@ TAG_CLOSURE(StgWord tag,StgClosure * p)
#include "SMPClosureOps.h" #include "SMPClosureOps.h"
#include "SpinLock.h" #include "SpinLock.h"
/* GNU mp library */
#if defined(HAVE_FRAMEWORK_GMP)
#include <GMP/gmp.h>
#else
#include "gmp.h"
#endif
/* Macros for STG/C code */ /* Macros for STG/C code */
#include "Block.h" #include "Block.h"
#include "ClosureMacros.h" #include "ClosureMacros.h"
......
...@@ -34,13 +34,6 @@ includes_CC_OPTS += -DTABLES_NEXT_TO_CODE ...@@ -34,13 +34,6 @@ includes_CC_OPTS += -DTABLES_NEXT_TO_CODE
endif endif
includes_CC_OPTS += -Iincludes -Irts -Irts/parallel includes_CC_OPTS += -Iincludes -Irts -Irts/parallel
ifeq "$(HaveLibGmp)" "YES"
ifneq "$(GMP_INCLUDE_DIRS)" ""
includes_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
endif
else
includes_CC_OPTS += -Igmp/gmpbuild
endif
ifneq "$(GhcWithSMP)" "YES" ifneq "$(GhcWithSMP)" "YES"
includes_CC_OPTS += -DNOSMP includes_CC_OPTS += -DNOSMP
......
...@@ -322,28 +322,6 @@ $(eval $(call build-dependencies,rts,dist)) ...@@ -322,28 +322,6 @@ $(eval $(call build-dependencies,rts,dist))
$(rts_dist_depfile) : libffi/ffi.h $(rts_dist_depfile) : libffi/ffi.h
# -----------------------------------------------------------------------------
# Need to get the GMP vars in through CPP to package.conf.in, and put
# quotes around each element.
rts_PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
rts_PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
ifneq "$(GMP_INCLUDE_DIRS)" ""
rts_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
rts_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
rts_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
endif
ifneq "$(GMP_LIB_DIRS)" ""
rts_LD_OPTS += -L$(GMP_LIB_DIRS)
endif
rts_CC_OPTS += -Igmp/gmpbuild
rts_HC_OPTS += -Igmp/gmpbuild
rts_HSC2HS_OPTS += -Igmp/gmpbuild
rts_LD_OPTS += -Lgmp/gmpbuild
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# libffi stuff # libffi stuff
......
...@@ -15,27 +15,18 @@ hidden-modules: ...@@ -15,27 +15,18 @@ hidden-modules:
import-dirs: import-dirs:
#ifdef INSTALLING #ifdef INSTALLING
library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR library-dirs: LIB_DIR PAPI_LIB_DIR
# ifdef mingw32_HOST_OS # ifdef mingw32_HOST_OS
, LIB_DIR"/gcc-lib" , LIB_DIR"/gcc-lib"
/* force the dist-provided gcc-lib/ into scope. */ /* force the dist-provided gcc-lib/ into scope. */
# endif # endif
#else /* !INSTALLING */ #else /* !INSTALLING */
library-dirs: TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR library-dirs: TOP"/rts/dist/build" PAPI_LIB_DIR
# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
, TOP"/gmp"
# endif
#endif #endif
hs-libraries: "HSrts" hs-libraries: "HSrts"
extra-libraries: "m" /* for ldexp() */ extra-libraries: "m" /* for ldexp() */
#ifndef HAVE_FRAMEWORK_GMP
, "gmp"
#ifdef HAVE_LIBDL
, "dl"
#endif
#endif
#ifdef HAVE_LIBRT #ifdef HAVE_LIBRT
, "rt" , "rt"
#endif #endif
...@@ -58,14 +49,9 @@ extra-libraries: "m" /* for ldexp() */ ...@@ -58,14 +49,9 @@ extra-libraries: "m" /* for ldexp() */
#endif #endif
#ifdef INSTALLING #ifdef INSTALLING
include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR include-dirs: INCLUDE_DIR PAPI_INCLUDE_DIR
#else /* !INSTALLING */ #else /* !INSTALLING */
include-dirs: TOP"/includes" include-dirs: TOP"/includes"
# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
TOP"/gmp/gmpbuild"
# endif
GMP_INCLUDE_DIRS
#endif
includes: Stg.h includes: Stg.h
depends: ffi-1.0 depends: ffi-1.0
...@@ -165,12 +151,6 @@ ld-options: ...@@ -165,12 +151,6 @@ ld-options:
framework-dirs: framework-dirs:
#ifdef HAVE_FRAMEWORK_GMP
frameworks: "GMP"
#else
frameworks:
#endif
haddock-interfaces: haddock-interfaces:
haddock-html: haddock-html:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment