From e53ba3592da5f72d1f701981126dbd28db9df98c Mon Sep 17 00:00:00 2001
From: Duncan Coutts <duncan@well-typed.com>
Date: Sat, 13 Jun 2009 19:19:56 +0000
Subject: [PATCH] Stop building the rts against gmp Nothing from gmp is used
 in the rts anymore.

---
 includes/Cmm.h      |    5 -----
 includes/Rts.h      |    7 -------
 includes/ghc.mk     |    7 -------
 rts/ghc.mk          |   22 ----------------------
 rts/package.conf.in |   26 +++-----------------------
 5 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/includes/Cmm.h b/includes/Cmm.h
index e3f46e1..4577672 100644
--- a/includes/Cmm.h
+++ b/includes/Cmm.h
@@ -342,11 +342,6 @@
 #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)
 
 /* -------------------------------------------------------------------------
diff --git a/includes/Rts.h b/includes/Rts.h
index 6c039f8..d965450 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -175,13 +175,6 @@ TAG_CLOSURE(StgWord tag,StgClosure * p)
 #include "SMPClosureOps.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 */
 #include "Block.h"
 #include "ClosureMacros.h"
diff --git a/includes/ghc.mk b/includes/ghc.mk
index 66a379a..a266bf4 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -34,13 +34,6 @@ includes_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
 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"
 includes_CC_OPTS += -DNOSMP
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 3074160..0102bed 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -322,28 +322,6 @@ $(eval $(call build-dependencies,rts,dist))
 
 $(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
 
diff --git a/rts/package.conf.in b/rts/package.conf.in
index d10ed0d..c75294d 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -15,27 +15,18 @@ hidden-modules:
 import-dirs:
 
 #ifdef INSTALLING
-library-dirs:		LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
+library-dirs:		LIB_DIR PAPI_LIB_DIR
 # ifdef mingw32_HOST_OS
 			, LIB_DIR"/gcc-lib"
 			/* force the dist-provided gcc-lib/ into scope. */
 # endif
 #else /* !INSTALLING */
-library-dirs:		TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
-			, TOP"/gmp"
-# endif
+library-dirs:		TOP"/rts/dist/build" PAPI_LIB_DIR
 #endif
 
 hs-libraries:   "HSrts"
 
 extra-libraries:		"m"		/* for ldexp() */
-#ifndef HAVE_FRAMEWORK_GMP
-			      , "gmp"
-#ifdef HAVE_LIBDL
-			      , "dl"
-#endif
-#endif
 #ifdef HAVE_LIBRT
 			      , "rt"
 #endif
@@ -58,14 +49,9 @@ extra-libraries:		"m"		/* for ldexp() */
 #endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
+include-dirs:		INCLUDE_DIR PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
 include-dirs:		TOP"/includes"
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
-             		TOP"/gmp/gmpbuild"
-# endif
-             		GMP_INCLUDE_DIRS
-#endif
 
 includes:		Stg.h
 depends:	 	ffi-1.0
@@ -165,12 +151,6 @@ ld-options:
 
 framework-dirs:
 
-#ifdef HAVE_FRAMEWORK_GMP
-frameworks:	"GMP"
-#else
-frameworks:
-#endif
-
 haddock-interfaces:
 haddock-html:
 
-- 
1.7.10.4