Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tobias Decking
GHC
Commits
e53ba359
Commit
e53ba359
authored
Jun 13, 2009
by
Duncan Coutts
Browse files
Stop building the rts against gmp
Nothing from gmp is used in the rts anymore.
parent
1b61c2db
Changes
5
Hide whitespace changes
Inline
Side-by-side
includes/Cmm.h
View file @
e53ba359
...
...
@@ -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)
/* -------------------------------------------------------------------------
...
...
includes/Rts.h
View file @
e53ba359
...
...
@@ -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"
...
...
includes/ghc.mk
View file @
e53ba359
...
...
@@ -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
...
...
rts/ghc.mk
View file @
e53ba359
...
...
@@ -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
...
...
rts/package.conf.in
View file @
e53ba359
...
...
@@ -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:
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment