diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-29 19:02:08 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-31 10:59:36 +0200 |
| commit | 995e8c1c8692b60c907c7d2ccea179d52ca8e69e (patch) | |
| tree | 1314ec36672d72b33a99b33e017316c0b8585625 | |
| parent | 1f69f37f34c6f15fd900c2c1cce3ce896168dde9 (diff) | |
| download | haskell-995e8c1c8692b60c907c7d2ccea179d52ca8e69e.tar.gz | |
Drop old integer-gmp-0.5 from GHC source tree
This completes what c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (#9281)
started. `integer-gmp-1.0` was added as an additional
`libraries/integer-gmp2` folder while retaining the ability to configure
GHC w/ the old `integer-gmp-0.5` to have a way back, and or the ability
to easily switch between old/new `integer-gmp` for benchmark/debugging
purposes.
This commit removes the old `libraries/integer-gmp` folder and moves
`libraries/integer-gmp2` into its place, while removing any mentions of
"gmp2" as well as the to support two different `integer-gmp` packages in
GHC's source-tree.
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D769
55 files changed, 137 insertions, 7653 deletions
diff --git a/compiler/basicTypes/Module.hs b/compiler/basicTypes/Module.hs index ac5efd4a2c..1cf0cbfa97 100644 --- a/compiler/basicTypes/Module.hs +++ b/compiler/basicTypes/Module.hs @@ -383,7 +383,6 @@ integerPackageKey = fsToPackageKey (fsLit n) where n = case cIntegerLibraryType of IntegerGMP -> "integer-gmp" - IntegerGMP2 -> "integer-gmp" IntegerSimple -> "integer-simple" basePackageKey = fsToPackageKey (fsLit "base") rtsPackageKey = fsToPackageKey (fsLit "rts") diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs index 87b7d168d2..9f6bb05c6a 100644 --- a/compiler/coreSyn/CorePrep.hs +++ b/compiler/coreSyn/CorePrep.hs @@ -1159,8 +1159,6 @@ lookupIntegerSDataConName :: DynFlags -> HscEnv -> IO (Maybe DataCon) lookupIntegerSDataConName dflags hsc_env = case cIntegerLibraryType of IntegerGMP -> guardIntegerUse dflags $ liftM Just $ initTcForLookup hsc_env (tcLookupDataCon integerSDataConName) - IntegerGMP2-> guardIntegerUse dflags $ liftM Just $ - initTcForLookup hsc_env (tcLookupDataCon integerSDataConName) IntegerSimple -> return Nothing -- | Helper for 'lookupMkIntegerName' and 'lookupIntegerSDataConName' diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 6f396fa514..c8cd557ae5 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -54,7 +54,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. @echo '#include "ghc_boot_platform.h"' >> $@ @echo >> $@ @echo 'data IntegerLibrary = IntegerGMP' >> $@ - @echo ' | IntegerGMP2' >> $@ @echo ' | IntegerSimple' >> $@ @echo ' deriving Eq' >> $@ @echo >> $@ @@ -88,8 +87,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. @echo 'cIntegerLibraryType :: IntegerLibrary' >> $@ ifeq "$(INTEGER_LIBRARY)" "integer-gmp" @echo 'cIntegerLibraryType = IntegerGMP' >> $@ -else ifeq "$(INTEGER_LIBRARY)" "integer-gmp2" - @echo 'cIntegerLibraryType = IntegerGMP2' >> $@ else ifeq "$(INTEGER_LIBRARY)" "integer-simple" @echo 'cIntegerLibraryType = IntegerSimple' >> $@ else ifneq "$(CLEANING)" "YES" diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs index 5e13227572..34499f3242 100644 --- a/compiler/prelude/PrelNames.hs +++ b/compiler/prelude/PrelNames.hs @@ -371,7 +371,6 @@ basicKnownKeyNames ] ++ case cIntegerLibraryType of IntegerGMP -> [integerSDataConName] - IntegerGMP2 -> [integerSDataConName] IntegerSimple -> [] genericTyConNames :: [Name] @@ -964,7 +963,6 @@ integerTyConName = tcQual gHC_INTEGER_TYPE (fsLit "Integer") int integerSDataConName = conName gHC_INTEGER_TYPE (fsLit n) integerSDataConKey where n = case cIntegerLibraryType of IntegerGMP -> "S#" - IntegerGMP2 -> "S#" IntegerSimple -> panic "integerSDataConName evaluated for integer-simple" mkIntegerName = varQual gHC_INTEGER_TYPE (fsLit "mkInteger") mkIntegerIdKey integerToWord64Name = varQual gHC_INTEGER_TYPE (fsLit "integerToWord64") integerToWord64IdKey @@ -587,8 +587,6 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins ifneq "$(CLEANING)" "YES" ifeq "$(INTEGER_LIBRARY)" "integer-gmp" libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp -else ifeq "$(INTEGER_LIBRARY)" "integer-gmp2" -libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp2 else ifeq "$(INTEGER_LIBRARY)" "integer-simple" libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple else @@ -649,16 +647,8 @@ endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp -BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" BUILD_DIRS += libraries/integer-gmp/gmp -BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants -endif - -ifeq "$(INTEGER_LIBRARY)" "integer-gmp2" -BUILD_DIRS += libraries/integer-gmp2/gmp -else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" -BUILD_DIRS += libraries/integer-gmp2/gmp endif ifeq "$(HADDOCK_DOCS)" "YES" @@ -1233,9 +1223,7 @@ sdist_%: .PHONY: clean -CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h -CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h CLEAN_FILES += libraries/base/include/EventConfig.h CLEAN_FILES += mk/config.mk.old CLEAN_FILES += mk/project.mk.old diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 9b16ccadd1..852f06453e 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -52,11 +52,6 @@ Flag integer-gmp Manual: True Default: False -Flag integer-gmp2 - Description: Use integer-gmp2 - Manual: True - Default: False - Library default-language: Haskell2010 other-extensions: @@ -103,10 +98,6 @@ Library build-depends: integer-simple >= 0.1.1 && < 0.2 if flag(integer-gmp) - build-depends: integer-gmp >= 0.5.1 && < 0.6 - cpp-options: -DOPTIMISE_INTEGER_GCD_LCM - - if flag(integer-gmp2) build-depends: integer-gmp >= 1.0 && < 1.1 cpp-options: -DOPTIMISE_INTEGER_GCD_LCM diff --git a/libraries/integer-gmp/.gitignore b/libraries/integer-gmp/.gitignore index 4e7da368da..3f3fc66144 100644 --- a/libraries/integer-gmp/.gitignore +++ b/libraries/integer-gmp/.gitignore @@ -1,16 +1,14 @@ +/GNUmakefile /autom4te.cache/ -/cbits/GmpDerivedConstants.h -/cbits/mkGmpDerivedConstants /config.log /config.status /configure /dist-install/ /ghc.mk /gmp/config.mk -/GNUmakefile /include/HsIntegerGmp.h /integer-gmp.buildinfo -/mkGmpDerivedConstants/dist/ /gmp/gmp.h /gmp/gmpbuild +/include/ghc-gmp.h diff --git a/libraries/integer-gmp/GHC/Integer.lhs b/libraries/integer-gmp/GHC/Integer.lhs deleted file mode 100644 index 392a94a082..0000000000 --- a/libraries/integer-gmp/GHC/Integer.lhs +++ /dev/null @@ -1,66 +0,0 @@ -\begin{code} -{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-} - ------------------------------------------------------------------------------ --- | --- Module : GHC.Integer --- Copyright : (c) The University of Glasgow 1994-2008 --- License : see libraries/integer-gmp/LICENSE --- --- Maintainer : cvs-ghc@haskell.org --- Stability : internal --- Portability : non-portable (GHC Extensions) --- --- The 'Integer' type. --- --- This module exposes the /portable/ 'Integer' API. See --- "GHC.Integer.GMP.Internals" for the GMP-specific internal --- representation of 'Integer' as well as optimized GMP-specific --- operations. ------------------------------------------------------------------------------ - -#include "MachDeps.h" - -module GHC.Integer ( - Integer, - - -- * Construct 'Integer's - mkInteger, smallInteger, wordToInteger, -#if WORD_SIZE_IN_BITS < 64 - word64ToInteger, int64ToInteger, -#endif - -- * Conversion to other integral types - integerToWord, integerToInt, -#if WORD_SIZE_IN_BITS < 64 - integerToWord64, integerToInt64, -#endif - - -- * Helpers for 'RealFloat' type-class operations - encodeFloatInteger, floatFromInteger, - encodeDoubleInteger, decodeDoubleInteger, doubleFromInteger, - - -- * Arithmetic operations - plusInteger, minusInteger, timesInteger, negateInteger, - absInteger, signumInteger, - divModInteger, divInteger, modInteger, - quotRemInteger, quotInteger, remInteger, - - -- * Comparison predicates - eqInteger, neqInteger, - leInteger, gtInteger, ltInteger, geInteger, compareInteger, - eqInteger#, neqInteger#, - leInteger#, gtInteger#, ltInteger#, geInteger#, - - -- * Bit-operations - andInteger, orInteger, xorInteger, complementInteger, - shiftLInteger, shiftRInteger, testBitInteger, - - -- * Hashing - hashInteger, - ) where - -import GHC.Integer.Type - -default () -\end{code} - diff --git a/libraries/integer-gmp/GHC/Integer/GMP/Internals.hs b/libraries/integer-gmp/GHC/Integer/GMP/Internals.hs deleted file mode 100644 index 0a212f712e..0000000000 --- a/libraries/integer-gmp/GHC/Integer/GMP/Internals.hs +++ /dev/null @@ -1,40 +0,0 @@ -{-# LANGUAGE NoImplicitPrelude #-} - --- | This modules provides access to the 'Integer' constructors and --- exposes some highly optimized GMP-operations. --- --- Note that since @integer-gmp@ does not depend on `base`, error --- reporting via exceptions, 'error', or 'undefined' is not --- available. Instead, the low-level functions will crash the runtime --- if called with invalid arguments. --- --- See also --- <https://ghc.haskell.org/trac/ghc/wiki/Commentary/Libraries/Integer GHC Commentary: Libraries/Integer>. - -module GHC.Integer.GMP.Internals - ( -- * The 'Integer' type - Integer(..) - - -- * Number theoretic functions - , gcdInt - , gcdInteger - , gcdExtInteger - , lcmInteger - , nextPrimeInteger - , testPrimeInteger - - -- * Exponentiation functions - , powInteger - , powModInteger - , powModSecInteger - , recipModInteger - - -- * Import/export functions - , sizeInBaseInteger - , importIntegerFromByteArray - , importIntegerFromAddr - , exportIntegerToMutableByteArray - , exportIntegerToAddr - ) where - -import GHC.Integer.Type diff --git a/libraries/integer-gmp/GHC/Integer/GMP/Prim.hs b/libraries/integer-gmp/GHC/Integer/GMP/Prim.hs deleted file mode 100644 index 4137dd5da9..0000000000 --- a/libraries/integer-gmp/GHC/Integer/GMP/Prim.hs +++ /dev/null @@ -1,372 +0,0 @@ -{-# LANGUAGE BangPatterns, CPP, MagicHash, NoImplicitPrelude, UnboxedTuples - , UnliftedFFITypes, GHCForeignImportPrim #-} -{-# OPTIONS_HADDOCK hide #-} - -#include "MachDeps.h" -module GHC.Integer.GMP.Prim ( - MPZ#, - - cmpInteger#, - cmpIntegerInt#, - - plusInteger#, - plusIntegerInt#, - minusInteger#, - minusIntegerInt#, - timesInteger#, - timesIntegerInt#, - - quotRemInteger#, - quotRemIntegerWord#, - quotInteger#, - quotIntegerWord#, - remInteger#, - remIntegerWord#, - - divModInteger#, - divModIntegerWord#, - divInteger#, - divIntegerWord#, - modInteger#, - modIntegerWord#, - divExactInteger#, - divExactIntegerWord#, - - gcdInteger#, - gcdExtInteger#, - gcdIntegerInt#, - gcdInt#, - - decodeDouble#, - - int2Integer#, - integer2Int#, - - word2Integer#, - integer2Word#, - - andInteger#, - orInteger#, - xorInteger#, - complementInteger#, - - testBitInteger#, - mul2ExpInteger#, - fdivQ2ExpInteger#, - - powInteger#, - powModInteger#, - powModSecInteger#, - recipModInteger#, - - nextPrimeInteger#, - testPrimeInteger#, - - sizeInBaseInteger#, - importIntegerFromByteArray#, - importIntegerFromAddr#, - exportIntegerToMutableByteArray#, - exportIntegerToAddr#, - -#if WORD_SIZE_IN_BITS < 64 - int64ToInteger#, integerToInt64#, - word64ToInteger#, integerToWord64#, -#endif - -#ifndef WORD_SIZE_IN_BITS -#error WORD_SIZE_IN_BITS not defined!!! -#endif - - ) where - -import GHC.Prim -import GHC.Types - --- Double isn't available yet, and we shouldn't be using defaults anyway: -default () - --- | This is represents a @mpz_t@ value in a heap-saving way. --- --- The first tuple element, @/s/@, encodes the sign of the integer --- @/i/@ (i.e. @signum /s/ == signum /i/@), and the number of /limbs/ --- used to represent the magnitude. If @abs /s/ > 1@, the 'ByteArray#' --- contains @abs /s/@ limbs encoding the integer. Otherwise, if @abs --- /s/ < 2@, the single limb is stored in the 'Word#' element instead --- (and the 'ByteArray#' element is undefined and MUST NOT be accessed --- as it doesn't point to a proper 'ByteArray#' but rather to an --- unsafe-coerced 'Int' in order be polite to the GC -- see --- @DUMMY_BYTE_ARR@ in gmp-wrappers.cmm) --- --- More specifically, the following encoding is used (where `⊥` means --- undefined/unused): --- --- * (# 0#, ⊥, 0## #) -> value = 0 --- * (# 1#, ⊥, w #) -> value = w --- * (# -1#, ⊥, w #) -> value = -w --- * (# s#, d, 0## #) -> value = J# s d --- --- This representation allows to avoid temporary heap allocations --- (-> Trac #8647) of 1-limb 'ByteArray#'s which fit into the --- 'S#'-constructor. Moreover, this allows to delays 1-limb --- 'ByteArray#' heap allocations, as such 1-limb `mpz_t`s can be --- optimistically allocated on the Cmm stack and returned as a @#word@ --- in case the `mpz_t` wasn't grown beyond 1 limb by the GMP --- operation. --- --- See also the 'GHC.Integer.Type.mpzToInteger' function which ought --- to be used for converting 'MPZ#'s to 'Integer's and the --- @MP_INT_1LIMB_RETURN()@ macro in @gmp-wrappers.cmm@ which --- constructs 'MPZ#' values in the first place for implementation --- details. -type MPZ# = (# Int#, ByteArray#, Word# #) - --- | Returns -1,0,1 according as first argument is less than, equal to, or greater than second argument. --- -foreign import prim "integer_cmm_cmpIntegerzh" cmpInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> Int# - --- | Returns -1,0,1 according as first argument is less than, equal to, or greater than second argument, which --- is an ordinary Int\#. -foreign import prim "integer_cmm_cmpIntegerIntzh" cmpIntegerInt# - :: Int# -> ByteArray# -> Int# -> Int# - --- | --- -foreign import prim "integer_cmm_plusIntegerzh" plusInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Optimized version of 'plusInteger#' for summing big-ints with small-ints --- -foreign import prim "integer_cmm_plusIntegerIntzh" plusIntegerInt# - :: Int# -> ByteArray# -> Int# -> MPZ# - --- | --- -foreign import prim "integer_cmm_minusIntegerzh" minusInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Optimized version of 'minusInteger#' for substracting small-ints from big-ints --- -foreign import prim "integer_cmm_minusIntegerIntzh" minusIntegerInt# - :: Int# -> ByteArray# -> Int# -> MPZ# - --- | --- -foreign import prim "integer_cmm_timesIntegerzh" timesInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Optimized version of 'timesInteger#' for multiplying big-ints with small-ints --- -foreign import prim "integer_cmm_timesIntegerIntzh" timesIntegerInt# - :: Int# -> ByteArray# -> Int# -> MPZ# - --- | Compute div and mod simultaneously, where div rounds towards negative --- infinity and\ @(q,r) = divModInteger#(x,y)@ implies --- @plusInteger# (timesInteger# q y) r = x@. --- -foreign import prim "integer_cmm_quotRemIntegerzh" quotRemInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> (# MPZ#, MPZ# #) - --- | Variant of 'quotRemInteger#' --- -foreign import prim "integer_cmm_quotRemIntegerWordzh" quotRemIntegerWord# - :: Int# -> ByteArray# -> Word# -> (# MPZ#, MPZ# #) - --- | Rounds towards zero. --- -foreign import prim "integer_cmm_quotIntegerzh" quotInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Rounds towards zero. -foreign import prim "integer_cmm_quotIntegerWordzh" quotIntegerWord# - :: Int# -> ByteArray# -> Word# -> MPZ# - --- | Satisfies \texttt{plusInteger\# (timesInteger\# (quotInteger\# x y) y) (remInteger\# x y) == x}. --- -foreign import prim "integer_cmm_remIntegerzh" remInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Variant of 'remInteger#' -foreign import prim "integer_cmm_remIntegerWordzh" remIntegerWord# - :: Int# -> ByteArray# -> Word# -> MPZ# - --- | Compute div and mod simultaneously, where div rounds towards negative infinity --- and\texttt{(q,r) = divModInteger\#(x,y)} implies \texttt{plusInteger\# (timesInteger\# q y) r = x}. --- -foreign import prim "integer_cmm_divModIntegerzh" divModInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> (# MPZ#, MPZ# #) -foreign import prim "integer_cmm_divModIntegerWordzh" divModIntegerWord# - :: Int# -> ByteArray# -> Word# -> (# MPZ#, MPZ# #) -foreign import prim "integer_cmm_divIntegerzh" divInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# -foreign import prim "integer_cmm_divIntegerWordzh" divIntegerWord# - :: Int# -> ByteArray# -> Word# -> MPZ# -foreign import prim "integer_cmm_modIntegerzh" modInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# -foreign import prim "integer_cmm_modIntegerWordzh" modIntegerWord# - :: Int# -> ByteArray# -> Word# -> MPZ# - --- | Divisor is guaranteed to be a factor of dividend. --- -foreign import prim "integer_cmm_divExactIntegerzh" divExactInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - -foreign import prim "integer_cmm_divExactIntegerWordzh" divExactIntegerWord# - :: Int# -> ByteArray# -> Word# -> MPZ# - --- | Greatest common divisor. --- -foreign import prim "integer_cmm_gcdIntegerzh" gcdInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | Extended greatest common divisor. --- -foreign import prim "integer_cmm_gcdExtIntegerzh" gcdExtInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> (# MPZ#, MPZ# #) - --- | Greatest common divisor, where second argument is an ordinary {\tt Int\#}. --- -foreign import prim "integer_cmm_gcdIntegerIntzh" gcdIntegerInt# - :: Int# -> ByteArray# -> Int# -> Int# - --- | --- -foreign import prim "integer_cmm_gcdIntzh" gcdInt# - :: Int# -> Int# -> Int# - --- | Convert to arbitrary-precision integer. --- First {\tt Int\#} in result is the exponent; second {\tt Int\#} and {\tt ByteArray\#} --- represent an {\tt Integer\#} holding the mantissa. --- -foreign import prim "integer_cmm_decodeDoublezh" decodeDouble# - :: Double# -> (# Int#, MPZ# #) - --- | --- --- Note: This primitive doesn't use 'MPZ#' because its purpose is to instantiate a 'J#'-value. -foreign import prim "integer_cmm_int2Integerzh" int2Integer# - :: Int# -> (# Int#, ByteArray# #) - --- | --- --- Note: This primitive doesn't use 'MPZ#' because its purpose is to instantiate a 'J#'-value. -foreign import prim "integer_cmm_word2Integerzh" word2Integer# - :: Word# -> (# Int#, ByteArray# #) - --- | --- -foreign import prim "integer_cmm_andIntegerzh" andInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_orIntegerzh" orInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_xorIntegerzh" xorInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_testBitIntegerzh" testBitInteger# - :: Int# -> ByteArray# -> Int# -> Int# - --- | --- -foreign import prim "integer_cmm_mul2ExpIntegerzh" mul2ExpInteger# - :: Int# -> ByteArray# -> Int# -> MPZ# - --- | --- -foreign import prim "integer_cmm_fdivQ2ExpIntegerzh" fdivQ2ExpInteger# - :: Int# -> ByteArray# -> Int# -> MPZ# - --- | --- -foreign import prim "integer_cmm_powIntegerzh" powInteger# - :: Int# -> ByteArray# -> Word# -> MPZ# - --- | --- -foreign import prim "integer_cmm_powModIntegerzh" powModInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_powModSecIntegerzh" powModSecInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_recipModIntegerzh" recipModInteger# - :: Int# -> ByteArray# -> Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_nextPrimeIntegerzh" nextPrimeInteger# - :: Int# -> ByteArray# -> MPZ# - --- | --- -foreign import prim "integer_cmm_testPrimeIntegerzh" testPrimeInteger# - :: Int# -> ByteArray# -> Int# -> Int# - --- | --- -foreign import prim "integer_cmm_sizeInBasezh" sizeInBaseInteger# - :: Int# -> ByteArray# -> Int# -> Word# - --- | --- -foreign import prim "integer_cmm_importIntegerFromByteArrayzh" importIntegerFromByteArray# - :: ByteArray# -> Word# -> Word# -> Int# -> MPZ# - --- | --- -foreign import prim "integer_cmm_importIntegerFromAddrzh" importIntegerFromAddr# - :: Addr# -> Word# -> Int# -> State# s -> (# State# s, MPZ# #) - --- | --- -foreign import prim "integer_cmm_exportIntegerToMutableByteArrayzh" exportIntegerToMutableByteArray# - :: Int# -> ByteArray# -> MutableByteArray# s -> Word# -> Int# -> State# s -> (# State# s, Word# #) - --- | --- -foreign import prim "integer_cmm_exportIntegerToAddrzh" exportIntegerToAddr# - :: Int# -> ByteArray# -> Addr# -> Int# -> State# s -> (# State# s, Word# #) - --- | --- -foreign import prim "integer_cmm_complementIntegerzh" complementInteger# - :: Int# -> ByteArray# -> MPZ# - -#if WORD_SIZE_IN_BITS < 64 --- Note: This primitive doesn't use 'MPZ#' because its purpose is to instantiate a 'J#'-value. -foreign import prim "integer_cmm_int64ToIntegerzh" int64ToInteger# - :: Int64# -> (# Int#, ByteArray# #) - --- Note: This primitive doesn't use 'MPZ#' because its purpose is to instantiate a 'J#'-value. -foreign import prim "integer_cmm_word64ToIntegerzh" word64ToInteger# - :: Word64# -> (# Int#, ByteArray# #) - -foreign import ccall unsafe "hs_integerToInt64" - integerToInt64# :: Int# -> ByteArray# -> Int64# - -foreign import ccall unsafe "hs_integerToWord64" - integerToWord64# :: Int# -> ByteArray# -> Word64# -#endif - --- used to be primops: -integer2Int# :: Int# -> ByteArray# -> Int# -integer2Int# s d = if isTrue# (s ==# 0#) - then 0# - else let !v = indexIntArray# d 0# in - if isTrue# (s <# 0#) - then negateInt# v - else v - -integer2Word# :: Int# -> ByteArray# -> Word# -integer2Word# s d = int2Word# (integer2Int# s d) diff --git a/libraries/integer-gmp/GHC/Integer/Logarithms.hs b/libraries/integer-gmp/GHC/Integer/Logarithms.hs deleted file mode 100644 index cfafe14226..0000000000 --- a/libraries/integer-gmp/GHC/Integer/Logarithms.hs +++ /dev/null @@ -1,43 +0,0 @@ -{-# LANGUAGE MagicHash, UnboxedTuples, NoImplicitPrelude #-} -module GHC.Integer.Logarithms - ( integerLogBase# - , integerLog2# - , wordLog2# - ) where - -import GHC.Prim -import GHC.Integer -import qualified GHC.Integer.Logarithms.Internals as I - --- | Calculate the integer logarithm for an arbitrary base. --- The base must be greater than 1, the second argument, the number --- whose logarithm is sought, should be positive, otherwise the --- result is meaningless. --- --- > base ^ integerLogBase# base m <= m < base ^ (integerLogBase# base m + 1) --- --- for @base > 1@ and @m > 0@. -integerLogBase# :: Integer -> Integer -> Int# -integerLogBase# b m = case step b of - (# _, e #) -> e - where - step pw = - if m `ltInteger` pw - then (# m, 0# #) - else case step (pw `timesInteger` pw) of - (# q, e #) -> - if q `ltInteger` pw - then (# q, 2# *# e #) - else (# q `quotInteger` pw, 2# *# e +# 1# #) - --- | Calculate the integer base 2 logarithm of an 'Integer'. --- The calculation is more efficient than for the general case, --- on platforms with 32- or 64-bit words much more efficient. --- --- The argument must be strictly positive, that condition is /not/ checked. -integerLog2# :: Integer -> Int# -integerLog2# = I.integerLog2# - --- | This function calculates the integer base 2 logarithm of a 'Word#'. -wordLog2# :: Word# -> Int# -wordLog2# = I.wordLog2# diff --git a/libraries/integer-gmp/GHC/Integer/Logarithms/Internals.hs b/libraries/integer-gmp/GHC/Integer/Logarithms/Internals.hs deleted file mode 100644 index 59c800a3f9..0000000000 --- a/libraries/integer-gmp/GHC/Integer/Logarithms/Internals.hs +++ /dev/null @@ -1,260 +0,0 @@ -{-# LANGUAGE CPP, MagicHash, UnboxedTuples, NoImplicitPrelude #-} -{-# OPTIONS_HADDOCK hide #-} - -#include "MachDeps.h" - --- Fast integer logarithms to base 2. --- integerLog2# and wordLog2# are of general usefulness, --- the others are only needed for a fast implementation of --- fromRational. --- Since they are needed in GHC.Float, we must expose this --- module, but it should not show up in the docs. - -module GHC.Integer.Logarithms.Internals - ( integerLog2# - , integerLog2IsPowerOf2# - , wordLog2# - , roundingMode# - ) where - -import GHC.Prim -import GHC.Types (isTrue#) -import GHC.Integer.Type - --- When larger word sizes become common, add support for those, --- it is not hard, just tedious. -#if (WORD_SIZE_IN_BITS != 32) && (WORD_SIZE_IN_BITS != 64) - --- Less than ideal implementations for strange word sizes - -import GHC.Integer - -default () - --- We do not know whether the word has 30 bits or 128 or even more, --- so we cannot start from the top, although that would be much more --- efficient. --- Count the bits until the highest set bit is found. -wordLog2# :: Word# -> Int# -wordLog2# w = go 8# w - where - go acc u = case u `uncheckedShiftRL#` 8# of - 0## -> case leadingZeros of - BA ba -> acc -# indexInt8Array# ba (word2Int# u) - v -> go (acc +# 8#) v - --- Assumption: Integer is strictly positive -integerLog2# :: Integer -> Int# -integerLog2# (S# i) = wordLog2# (int2Word# i) -- that is easy -integerLog2# m = case step m (smallInteger 2#) 1# of - (# _, l #) -> l - where - -- Invariants: - -- pw = 2 ^ lg - -- case step n pw lg of - -- (q, e) -> pw^(2*e) <= n < pw^(2*e+2) - -- && q <= n/pw^(2*e) < (q+1) - -- && q < pw^2 - step n pw lg = - if n `ltInteger` pw - then (# n, 0# #) - else case step n (shiftLInteger pw lg) (2# *# lg) of - (# q, e #) -> - if q `ltInteger` pw - then (# q, 2# *# e #) - else (# q `shiftRInteger` lg, 2# *# e +# 1# #) - --- Calculate the log2 of a positive integer and check --- whether it is a power of 2. --- By coincidence, the presence of a power of 2 is --- signalled by zero and not one. -integerLog2IsPowerOf2# :: Integer -> (# Int#, Int# #) -integerLog2IsPowerOf2# m = - case integerLog2# m of - lg -> if m `eqInteger` (smallInteger 1# `shiftLInteger` lg) - then (# lg, 0# #) - else (# lg, 1# #) - --- Detect the rounding mode, --- 0# means round to zero, --- 1# means round to even, --- 2# means round away from zero -roundingMode# :: Integer -> Int# -> Int# -roundingMode# m h = - case smallInteger 1# `shiftLInteger` h of - c -> case m `andInteger` - ((c `plusInteger` c) `minusInteger` smallInteger 1#) of - r -> - if c `ltInteger` r - then 2# - else if c `gtInteger` r - then 0# - else 1# - -#else - -default () - --- We have a nice word size, we can do much better now. - -#if WORD_SIZE_IN_BITS == 32 - -#define WSHIFT 5 -#define MMASK 31 - -#else - -#define WSHIFT 6 -#define MMASK 63 - -#endif - --- Assumption: Integer is strictly positive --- For small integers, use wordLog#, --- in the general case, check words from the most --- significant down, once a nonzero word is found, --- calculate its log2 and add the number of following bits. -integerLog2# :: Integer -> Int# -integerLog2# (S# i) = wordLog2# (int2Word# i) -integerLog2# (J# s ba) = check (s -# 1#) - where - check i = case indexWordArray# ba i of - 0## -> check (i -# 1#) - w -> wordLog2# w +# (uncheckedIShiftL# i WSHIFT#) - --- Assumption: Integer is strictly positive --- First component is log2 n, second is 0# iff n is a power of two -integerLog2IsPowerOf2# :: Integer -> (# Int#, Int# #) --- The power of 2 test is n&(n-1) == 0, thus powers of 2 --- are indicated bythe second component being zero. -integerLog2IsPowerOf2# (S# i) = - case int2Word# i of - w -> (# wordLog2# w, word2Int# (w `and#` (w `minusWord#` 1##)) #) --- Find the log2 as above, test whether that word is a power --- of 2, if so, check whether only zero bits follow. -integerLog2IsPowerOf2# (J# s ba) = check (s -# 1#) - where - check :: Int# -> (# Int#, Int# #) - check i = case indexWordArray# ba i of - 0## -> check (i -# 1#) - w -> (# wordLog2# w +# (uncheckedIShiftL# i WSHIFT#) - , case w `and#` (w `minusWord#` 1##) of - 0## -> test (i -# 1#) - _ -> 1# #) - test :: Int# -> Int# - test i = if isTrue# (i <# 0#) - then 0# - else case indexWordArray# ba i of - 0## -> test (i -# 1#) - _ -> 1# - --- Assumption: Integer and Int# are strictly positive, Int# is less --- than logBase 2 of Integer, otherwise havoc ensues. --- Used only for the numerator in fromRational when the denominator --- is a power of 2. --- The Int# argument is log2 n minus the number of bits in the mantissa --- of the target type, i.e. the index of the first non-integral bit in --- the quotient. --- --- 0# means round down (towards zero) --- 1# means we have a half-integer, round to even --- 2# means round up (away from zero) -roundingMode# :: Integer -> Int# -> Int# -roundingMode# (S# i) t = - case int2Word# i `and#` ((uncheckedShiftL# 2## t) `minusWord#` 1##) of - k -> case uncheckedShiftL# 1## t of - c -> if isTrue# (c `gtWord#` k) - then 0# - else if isTrue# (c `ltWord#` k) - then 2# - else 1# -roundingMode# (J# _ ba) t = - case word2Int# (int2Word# t `and#` MMASK##) of - j -> -- index of relevant bit in word - case uncheckedIShiftRA# t WSHIFT# of - k -> -- index of relevant word - case indexWordArray# ba k `and#` - ((uncheckedShiftL# 2## j) `minusWord#` 1##) of - r -> - case uncheckedShiftL# 1## j of - c -> if isTrue# (c `gtWord#` r) - then 0# - else if isTrue# (c `ltWord#` r) - then 2# - else test (k -# 1#) - where - test i = if isTrue# (i <# 0#) - then 1# - else case indexWordArray# ba i of - 0## -> test (i -# 1#) - _ -> 2# - --- wordLog2# 0## = -1# -{-# INLINE wordLog2# #-} -wordLog2# :: Word# -> Int# -wordLog2# w = - case leadingZeros of - BA lz -> - let zeros u = indexInt8Array# lz (word2Int# u) in -#if WORD_SIZE_IN_BITS == 64 - case uncheckedShiftRL# w 56# of - a -> - if isTrue# (a `neWord#` 0##) - then 64# -# zeros a - else - case uncheckedShiftRL# w 48# of - b -> - if isTrue# (b `neWord#` 0##) - then 56# -# zeros b - else - case uncheckedShiftRL# w 40# of - c -> - if isTrue# (c `neWord#` 0##) - then 48# -# zeros c - else - case uncheckedShiftRL# w 32# of - d -> - if isTrue# (d `neWord#` 0##) - then 40# -# zeros d - else -#endif - case uncheckedShiftRL# w 24# of - e -> - if isTrue# (e `neWord#` 0##) - then 32# -# zeros e - else - case uncheckedShiftRL# w 16# of - f -> - if isTrue# (f `neWord#` 0##) - then 24# -# zeros f - else - case uncheckedShiftRL# w 8# of - g -> - if isTrue# (g `neWord#` 0##) - then 16# -# zeros g - else 8# -# zeros w - -#endif - --- Lookup table -data BA = BA ByteArray# - -leadingZeros :: BA -leadingZeros = - let mkArr s = - case newByteArray# 256# s of - (# s1, mba #) -> - case writeInt8Array# mba 0# 9# s1 of - s2 -> - let fillA lim val idx st = - if isTrue# (idx ==# 256#) - then st - else if isTrue# (idx <# lim) - then case writeInt8Array# mba idx val st of - nx -> fillA lim val (idx +# 1#) nx - else fillA (2# *# lim) (val -# 1#) idx st - in case fillA 2# 8# 1# s2 of - s3 -> case unsafeFreezeByteArray# mba s3 of - (# _, ba #) -> ba - in case mkArr realWorld# of - b -> BA b diff --git a/libraries/integer-gmp/GHC/Integer/Type.lhs b/libraries/integer-gmp/GHC/Integer/Type.lhs deleted file mode 100644 index 0f408ff0a0..0000000000 --- a/libraries/integer-gmp/GHC/Integer/Type.lhs +++ /dev/null @@ -1,1021 +0,0 @@ -\begin{code} -{-# LANGUAGE BangPatterns, CPP, UnboxedTuples, UnliftedFFITypes, MagicHash, NoImplicitPrelude #-} -{-# OPTIONS_HADDOCK hide #-} - --- Commentary of Integer library is located on the wiki: --- http://ghc.haskell.org/trac/ghc/wiki/Commentary/Libraries/Integer --- --- It gives an in-depth description of implementation details and --- decisions. --- --- TODO: Try to use optimized big/small int primops on IL32P64 archs --- (mostly Windows/x86_64). Currently, we have to fall back to --- unoptimized code-paths for most big/small-int primops, due to --- @mpz_*()@ functions using @long@ types, which is smaller than --- @mp_limb_t@ on IL32P64. The @mpn_*()@ functions are often safe to --- use, as they use @mb_limb_t@ instead of @long@. --- (look out for @#if SIZEOF_HSWORD == SIZEOF_LONG@ occurences) --- - -#include "MachDeps.h" -#include "HsIntegerGmp.h" - -#if SIZEOF_HSWORD == 4 -#define INT_MINBOUND (-2147483648#) -#define NEG_INT_MINBOUND (S# 2147483647# `plusInteger` S# 1#) -#elif SIZEOF_HSWORD == 8 -#define INT_MINBOUND (-9223372036854775808#) -#define NEG_INT_MINBOUND (S# 9223372036854775807# `plusInteger` S# 1#) -#else -#error Unknown SIZEOF_HSWORD; can't define INT_MINBOUND and NEG_INT_MINBOUND -#endif - -module GHC.Integer.Type where - -import GHC.Prim ( - -- Other types we use, convert from, or convert to - Int#, Word#, Double#, Float#, ByteArray#, MutableByteArray#, Addr#, State#, - indexIntArray#, - -- Conversions between those types - int2Word#, int2Double#, int2Float#, word2Int#, - -- Operations on Int# that we use for operations on S# - quotInt#, remInt#, quotRemInt#, negateInt#, - (*#), (-#), - (==#), (/=#), (<=#), (>=#), (<#), (>#), - mulIntMayOflo#, addIntC#, subIntC#, - and#, or#, xor#, - ) - -import GHC.Integer.GMP.Prim ( - -- GMP-related primitives - MPZ#, - cmpInteger#, cmpIntegerInt#, - plusInteger#, minusInteger#, - timesInteger#, - quotRemInteger#, quotInteger#, remInteger#, - divModInteger#, divInteger#, modInteger#, - divExactInteger#, - gcdInteger#, gcdExtInteger#, gcdIntegerInt#, gcdInt#, - decodeDouble#, - int2Integer#, integer2Int#, word2Integer#, integer2Word#, - andInteger#, orInteger#, xorInteger#, complementInteger#, - testBitInteger#, mul2ExpInteger#, fdivQ2ExpInteger#, - powInteger#, powModInteger#, powModSecInteger#, recipModInteger#, - nextPrimeInteger#, testPrimeInteger#, - sizeInBaseInteger#, - importIntegerFromByteArray#, importIntegerFromAddr#, - exportIntegerToMutableByteArray#, exportIntegerToAddr#, - -#if SIZEOF_HSWORD == SIZEOF_LONG - plusIntegerInt#, minusIntegerInt#, - timesIntegerInt#, - divIntegerWord#, modIntegerWord#, divModIntegerWord#, - divExactIntegerWord#, - quotIntegerWord#, remIntegerWord#, quotRemIntegerWord#, -#endif - -#if WORD_SIZE_IN_BITS < 64 - int64ToInteger#, integerToInt64#, - word64ToInteger#, integerToWord64#, -#endif - ) - -#if WORD_SIZE_IN_BITS < 64 -import GHC.IntWord64 ( - Int64#, Word64#, - int64ToWord64#, intToInt64#, - int64ToInt#, word64ToInt64#, - geInt64#, leInt64#, leWord64#, - ) -#endif - -import GHC.Classes -import GHC.Types - -default () -\end{code} - -%********************************************************* -%* * -\subsection{The @Integer@ type} -%* * -%********************************************************* - -Convenient boxed Integer PrimOps. - -\begin{code} --- | Arbitrary-precision integers. -data Integer - = S# Int# -- ^ \"small\" integers fitting into an 'Int#' - | J# Int# ByteArray# -- ^ \"big\" integers represented as GMP's @mpz_t@ structure. - -- - -- The 'Int#' field corresponds to @mpz_t@'s @_mp_size@ field, - -- which encodes the sign and the number of /limbs/ stored in the - -- 'ByteArray#' field (i.e. @mpz_t@'s @_mp_d@ field). Note: The - -- 'ByteArray#' may have been over-allocated, and thus larger - -- than the size denoted by the 'Int#' field. - -- - -- This representation tries to avoid using the GMP number - -- representation for small integers that fit into a native - -- 'Int#'. This allows to reduce (or at least defer) calling into GMP - -- for operations whose results remain in the 'Int#'-domain. - -- - -- Note: It does __not__ constitute a violation of invariants to - -- represent an integer which would fit into an 'Int#' with the - -- 'J#'-constructor. For instance, the value @0@ has (only) two valid - -- representations, either @'S#' 0#@ or @'J#' 0 _@. - --- | Construct 'Integer' value from list of 'Int's. --- --- This function is used by GHC for constructing 'Integer' literals. -mkInteger :: Bool -- ^ sign of integer ('True' if non-negative) - -> [Int] -- ^ absolute value expressed in 31 bit chunks, least significant first - - -- (ideally these would be machine-word 'Word's rather than 31-bit truncated 'Int's) - -> Integer -mkInteger nonNegative is = let abs = f is - in if nonNegative then abs else negateInteger abs - where f [] = S# 0# - f (I# i : is') = S# i `orInteger` shiftLInteger (f is') 31# - -{-# NOINLINE smallInteger #-} -smallInteger :: Int# -> Integer -smallInteger i = S# i - -{-# NOINLINE wordToInteger #-} -wordToInteger :: Word# -> Integer -wordToInteger w = if isTrue# (i >=# 0#) - then S# i - else case word2Integer# w of (# s, d #) -> J# s d - where - !i = word2Int# w - -{-# NOINLINE integerToWord #-} -integerToWord :: Integer -> Word# -integerToWord (S# i) = int2Word# i -integerToWord (J# s d) = integer2Word# s d - -#if WORD_SIZE_IN_BITS < 64 -{-# NOINLINE integerToWord64 #-} -integerToWord64 :: Integer -> Word64# -integerToWord64 (S# i) = int64ToWord64# (intToInt64# i) -integerToWord64 (J# s d) = integerToWord64# s d - -{-# NOINLINE word64ToInteger #-} -word64ToInteger :: Word64# -> Integer -word64ToInteger w = if isTrue# (w `leWord64#` int64ToWord64# (intToInt64# 0x7FFFFFFF#)) - then S# (int64ToInt# (word64ToInt64# w)) - else case word64ToInteger# w of - (# s, d #) -> J# s d - -{-# NOINLINE integerToInt64 #-} -integerToInt64 :: Integer -> Int64# -integerToInt64 (S# i) = intToInt64# i -integerToInt64 (J# s d) = integerToInt64# s d - -{-# NOINLINE int64ToInteger #-} -int64ToInteger :: Int64# -> Integer -int64ToInteger i = if isTrue# (i `leInt64#` intToInt64# 0x7FFFFFFF#) && - isTrue# (i `geInt64#` intToInt64# -0x80000000#) - then smallInteger (int64ToInt# i) - else case int64ToInteger# i of - (# s, d #) -> J# s d -#endif - -integerToInt :: Integer -> Int# -{-# NOINLINE integerToInt #-} -integerToInt (S# i) = i -integerToInt (J# s d) = integer2Int# s d - --- This manually floated out constant is needed as GHC doesn't do it on its own -minIntAsBig :: Integer -minIntAsBig = case int2Integer# INT_MINBOUND of { (# s, d #) -> J# s d } - --- | Promote 'S#' to 'J#' -toBig :: Integer -> Integer -toBig (S# i) = case int2Integer# i of { (# s, d #) -> J# s d } -toBig i@(J# _ _) = i - --- | Demote 'J#' to 'S#' if possible. See also 'smartJ#'. -toSmall :: Integer -> Integer -toSmall i@(S# _) = i -toSmall (J# s# mb#) = smartJ# s# mb# - - --- | Smart 'J#' constructor which tries to construct 'S#' if possible -smartJ# :: Int# -> ByteArray# -> Integer -smartJ# 0# _ = S# 0# -smartJ# 1# mb# | isTrue# (v ># 0#) = S# v - where - v = indexIntArray# mb# 0# -smartJ# (-1#) mb# | isTrue# (v <# 0#) = S# v - where - v = negateInt# (indexIntArray# mb# 0#) -smartJ# s# mb# = J# s# mb# - --- |Construct 'Integer' out of a 'MPZ#' as returned by GMP wrapper primops --- --- IMPORTANT: The 'ByteArray#' element MUST NOT be accessed unless the --- size-element indicates more than one limb! --- --- See notes at definition site of 'MPZ#' in "GHC.Integer.GMP.Prim" --- for more details. -mpzToInteger :: MPZ# -> Integer -mpzToInteger (# 0#, _, _ #) = S# 0# -mpzToInteger (# 1#, _, w# #) | isTrue# (v# >=# 0#) = S# v# - | True = case word2Integer# w# of (# _, d #) -> J# 1# d - where - v# = word2Int# w# -mpzToInteger (# -1#, _, w# #) | isTrue# (v# <=# 0#) = S# v# - | True = case word2Integer# w# of (# _, d #) -> J# -1# d - where - v# = negateInt# (word2Int# w#) -mpzToInteger (# s#, mb#, _ #) = J# s# mb# - --- | Variant of 'mpzToInteger' for pairs of 'Integer's -mpzToInteger2 :: (# MPZ#, MPZ# #) -> (# Integer, Integer #) -mpzToInteger2 (# mpz1, mpz2 #) = (# i1, i2 #) - where - !i1 = mpzToInteger mpz1 -- This use of `!` avoids creating thunks, - !i2 = mpzToInteger mpz2 -- see also Note [Use S# if possible]. - --- |Negate MPZ# -mpzNeg :: MPZ# -> MPZ# -mpzNeg (# s#, mb#, w# #) = (# negateInt# s#, mb#, w# #) - -\end{code} - -Note [Use S# if possible] -~~~~~~~~~~~~~~~~~~~~~~~~~ -It's a big win to use S#, rather than J#, whenever possible. Not only -does it take less space, but (probably more important) subsequent -operations are more efficient. See Trac #8638. - -'smartJ#' is the smart constructor for J# that performs the necessary -tests. When returning a nested result, we always use smartJ# strictly, -thus - let !r = smartJ# a b in (# r, somthing_else #) -to avoid creating a thunk that is subsequently evaluated to a J#. -smartJ# itself does a pretty small amount of work, so it's not worth -thunking it. - -We call 'smartJ#' in places like quotRemInteger where a big input -might produce a small output. - -Just using smartJ# in this way has good results: - - Program Size Allocs Runtime Elapsed TotalMem --------------------------------------------------------------------------------- - gamteb +0.1% -19.0% 0.03 0.03 +0.0% - kahan +0.2% -1.2% 0.17 0.17 +0.0% - mandel +0.1% -7.7% 0.05 0.05 +0.0% - power +0.1% -40.8% -32.5% -32.5% +0.0% - symalg +0.2% -0.5% 0.01 0.01 +0.0% --------------------------------------------------------------------------------- - Min +0.0% -40.8% -32.5% -32.5% -5.1% - Max +0.2% +0.1% +2.0% +2.0% +0.0% - Geometric Mean +0.1% -1.0% -2.5% -2.5% -0.1% - -%********************************************************* -%* * -\subsection{Dividing @Integers@} -%* * -%********************************************************* - -\begin{code} --- XXX There's no good reason for us using unboxed tuples for the --- results, but we don't have Data.Tuple available. - --- Note that we don't check for divide-by-zero here. That needs --- to be done where it's used. --- (we don't have error) - -{-# NOINLINE quotRemInteger #-} -quotRemInteger :: Integer -> Integer -> (# Integer, Integer #) -quotRemInteger (S# INT_MINBOUND) b = quotRemInteger minIntAsBig b -quotRemInteger (S# i) (S# j) = case quotRemInt# i j of - (# q, r #) -> (# S# q, S# r #) -#if SIZEOF_HSWORD == SIZEOF_LONG -quotRemInteger (J# s1 d1) (S# b) | isTrue# (b <# 0#) - = case quotRemIntegerWord# s1 d1 (int2Word# (negateInt# b)) of - (# q, r #) -> let !q' = mpzToInteger (mpzNeg q) - !r' = mpzToInteger r - in (# q', r' #) -- see also Trac #8726 -quotRemInteger (J# s1 d1) (S# b) - = mpzToInteger2 (quotRemIntegerWord# s1 d1 (int2Word# b)) -#else -quotRemInteger i1@(J# _ _) i2@(S# _) = quotRemInteger i1 (toBig i2) -#endif -quotRemInteger i1@(S# _) i2@(J# _ _) = quotRemInteger (toBig i1) i2 -quotRemInteger (J# s1 d1) (J# s2 d2) - = mpzToInteger2(quotRemInteger# s1 d1 s2 d2) -- See Note [Use S# if possible] - -{-# NOINLINE divModInteger #-} -divModInteger :: Integer -> Integer -> (# Integer, Integer #) -divModInteger (S# INT_MINBOUND) b = divModInteger minIntAsBig b -divModInteger (S# i) (S# j) = (# S# d, S# m #) - where - -- NB. don't inline these. (# S# (i `quotInt#` j), ... #) means - -- (# let q = i `quotInt#` j in S# q, ... #) which builds a - -- useless thunk. Placing the bindings here means they'll be - -- evaluated strictly. - !d = i `divInt#` j - !m = i `modInt#` j -#if SIZEOF_HSWORD == SIZEOF_LONG -divModInteger (J# s1 d1) (S# b) | isTrue# (b <# 0#) - = case divModIntegerWord# (negateInt# s1) d1 (int2Word# (negateInt# b)) of - (# q, r #) -> let !q' = mpzToInteger q - !r' = mpzToInteger (mpzNeg r) - in (# q', r' #) -- see also Trac #8726 -divModInteger (J# s1 d1) (S# b) - = mpzToInteger2(divModIntegerWord# s1 d1 (int2Word# b)) -#else -divModInteger i1@(J# _ _) i2@(S# _) = divModInteger i1 (toBig i2) -#endif -divModInteger i1@(S# _) i2@(J# _ _) = divModInteger (toBig i1) i2 -divModInteger (J# s1 d1) (J# s2 d2) = mpzToInteger2 (divModInteger# s1 d1 s2 d2) - -{-# NOINLINE remInteger #-} -remInteger :: Integer -> Integer -> Integer -remInteger (S# INT_MINBOUND) b = remInteger minIntAsBig b -remInteger (S# a) (S# b) = S# (remInt# a b) -{- Special case doesn't work, because a 1-element J# has the range - -(2^32-1) -- 2^32-1, whereas S# has the range -2^31 -- (2^31-1) -remInteger ia@(S# a) (J# sb b) - | sb ==# 1# = S# (remInt# a (word2Int# (integer2Word# sb b))) - | sb ==# -1# = S# (remInt# a (0# -# (word2Int# (integer2Word# sb b)))) - | 0# <# sb = ia - | otherwise = S# (0# -# a) --} -remInteger ia@(S# _) ib@(J# _ _) = remInteger (toBig ia) ib -#if SIZEOF_HSWORD == SIZEOF_LONG -remInteger (J# sa a) (S# b) - = mpzToInteger (remIntegerWord# sa a w) - where - w = int2Word# (if isTrue# (b <# 0#) then negateInt# b else b) -#else -remInteger i1@(J# _ _) i2@(S# _) = remInteger i1 (toBig i2) -#endif -remInteger (J# sa a) (J# sb b) - = mpzToInteger (remInteger# sa a sb b) - -{-# NOINLINE quotInteger #-} -quotInteger :: Integer -> Integer -> Integer -quotInteger (S# INT_MINBOUND) b = quotInteger minIntAsBig b -quotInteger (S# a) (S# b) = S# (quotInt# a b) -{- Special case disabled, see remInteger above -quotInteger (S# a) (J# sb b) - | sb ==# 1# = S# (quotInt# a (word2Int# (integer2Word# sb b))) - | sb ==# -1# = S# (quotInt# a (0# -# (word2Int# (integer2Word# sb b)))) - | otherwise = S# 0 --} -quotInteger ia@(S# _) ib@(J# _ _) = quotInteger (toBig ia) ib -#if SIZEOF_HSWORD == SIZEOF_LONG -quotInteger (J# sa a) (S# b) | isTrue# (b <# 0#) - = mpzToInteger (mpzNeg (quotIntegerWord# sa a (int2Word# (negateInt# b)))) -quotInteger (J# sa a) (S# b) - = mpzToInteger (quotIntegerWord# sa a (int2Word# b)) -#else -quotInteger i1@(J# _ _) i2@(S# _) = quotInteger i1 (toBig i2) -#endif -quotInteger (J# sa a) (J# sb b) - = mpzToInteger (quotInteger# sa a sb b) - -{-# NOINLINE modInteger #-} -modInteger :: Integer -> Integer -> Integer -modInteger (S# INT_MINBOUND) b = modInteger minIntAsBig b -modInteger (S# a) (S# b) = S# (modInt# a b) -modInteger ia@(S# _) ib@(J# _ _) = modInteger (toBig ia) ib -#if SIZEOF_HSWORD == SIZEOF_LONG -modInteger (J# sa a) (S# b) | isTrue# (b <# 0#) - = mpzToInteger (mpzNeg (modIntegerWord# (negateInt# sa) a (int2Word# (negateInt# b)))) -modInteger (J# sa a) (S# b) - = mpzToInteger (modIntegerWord# sa a (int2Word# b)) -#else -modInteger i1@(J# _ _) i2@(S# _) = modInteger i1 (toBig i2) -#endif -modInteger (J# sa a) (J# sb b) - = mpzToInteger (modInteger# sa a sb b) - -{-# NOINLINE divInteger #-} -divInteger :: Integer -> Integer -> Integer -divInteger (S# INT_MINBOUND) b = divInteger minIntAsBig b -divInteger (S# a) (S# b) = S# (divInt# a b) -divInteger ia@(S# _) ib@(J# _ _) = divInteger (toBig ia) ib -#if SIZEOF_HSWORD == SIZEOF_LONG -divInteger (J# sa a) (S# b) | isTrue# (b <# 0#) - = mpzToInteger (divIntegerWord# (negateInt# sa) a (int2Word# (negateInt# b))) -divInteger (J# sa a) (S# b) - = mpzToInteger (divIntegerWord# sa a (int2Word# b)) -#else -divInteger i1@(J# _ _) i2@(S# _) = divInteger i1 (toBig i2) -#endif -divInteger (J# sa a) (J# sb b) - = mpzToInteger (divInteger# sa a sb b) -\end{code} - - - -\begin{code} --- | Compute greatest common divisor. -{-# NOINLINE gcdInteger #-} -gcdInteger :: Integer -> Integer -> Integer --- SUP: Do we really need the first two cases? -gcdInteger (S# INT_MINBOUND) b = gcdInteger minIntAsBig b -gcdInteger a (S# INT_MINBOUND) = gcdInteger a minIntAsBig -gcdInteger (S# a) (S# b) = S# (gcdInt a b) -gcdInteger ia@(S# a) ib@(J# sb b) - = if isTrue# (a ==# 0#) then absInteger ib - else if isTrue# (sb ==# 0#) then absInteger ia - else S# (gcdIntegerInt# absSb b absA) - where !absA = if isTrue# (a <# 0#) then negateInt# a else a - !absSb = if isTrue# (sb <# 0#) then negateInt# sb else sb -gcdInteger ia@(J# _ _) ib@(S# _) = gcdInteger ib ia -gcdInteger (J# sa a) (J# sb b) = mpzToInteger (gcdInteger# sa a sb b) - --- | Extended euclidean algorithm. --- --- For @/a/@ and @/b/@, compute their greatest common divisor @/g/@ --- and the coefficient @/s/@ satisfying @/a//s/ + /b//t/ = /g/@. --- --- /Since: 0.5.1.0/ -{-# NOINLINE gcdExtInteger #-} -gcdExtInteger :: Integer -> Integer -> (# Integer, Integer #) -gcdExtInteger a@(S# _) b@(S# _) = gcdExtInteger (toBig a) (toBig b) -gcdExtInteger a@(S# _) b@(J# _ _) = gcdExtInteger (toBig a) b -gcdExtInteger a@(J# _ _) b@(S# _) = gcdExtInteger a (toBig b) -gcdExtInteger (J# sa a) (J# sb b) = mpzToInteger2 (gcdExtInteger# sa a sb b) - --- | Compute least common multiple. -{-# NOINLINE lcmInteger #-} -lcmInteger :: Integer -> Integer -> Integer -lcmInteger a b = if a `eqInteger` S# 0# then S# 0# - else if b `eqInteger` S# 0# then S# 0# - else (divExact aa (gcdInteger aa ab)) `timesInteger` ab - where aa = absInteger a - ab = absInteger b - --- | Compute greatest common divisor. -gcdInt :: Int# -> Int# -> Int# -gcdInt 0# y = absInt y -gcdInt x 0# = absInt x -gcdInt x y = gcdInt# (absInt x) (absInt y) - -absInt :: Int# -> Int# -absInt x = if isTrue# (x <# 0#) then negateInt# x else x - -divExact :: Integer -> Integer -> Integer -divExact (S# INT_MINBOUND) b = divExact minIntAsBig b -divExact (S# a) (S# b) = S# (quotInt# a b) -divExact (S# a) (J# sb b) - = S# (quotInt# a (integer2Int# sb b)) -#if SIZEOF_HSWORD == SIZEOF_LONG -divExact (J# sa a) (S# b) | isTrue# (b <# 0#) - = mpzToInteger (divExactIntegerWord# (negateInt# sa) a (int2Word# (negateInt# b))) -divExact (J# sa a) (S# b) = mpzToInteger (divExactIntegerWord# sa a (int2Word# b)) -#else -divExact i1@(J# _ _) i2@(S# _) = divExact i1 (toBig i2) -#endif -divExact (J# sa a) (J# sb b) = mpzToInteger (divExactInteger# sa a sb b) -\end{code} - - -%********************************************************* -%* * -\subsection{The @Integer@ instances for @Eq@, @Ord@} -%* * -%********************************************************* - -\begin{code} - --- | /Since: 0.5.1.0/ -{-# NOINLINE eqInteger# #-} -eqInteger# :: Integer -> Integer -> Int# -eqInteger# (S# i) (S# j) = i ==# j -eqInteger# (S# i) (J# s d) = cmpIntegerInt# s d i ==# 0# -eqInteger# (J# s d) (S# i) = cmpIntegerInt# s d i ==# 0# -eqInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) ==# 0# - --- | /Since: 0.5.1.0/ -{-# NOINLINE neqInteger# #-} -neqInteger# :: Integer -> Integer -> Int# -neqInteger# (S# i) (S# j) = i /=# j -neqInteger# (S# i) (J# s d) = cmpIntegerInt# s d i /=# 0# -neqInteger# (J# s d) (S# i) = cmpIntegerInt# s d i /=# 0# -neqInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) /=# 0# - -{-# INLINE eqInteger #-} -{-# INLINE neqInteger #-} -eqInteger, neqInteger :: Integer -> Integer -> Bool -eqInteger a b = isTrue# (a `eqInteger#` b) -neqInteger a b = isTrue# (a `neqInteger#` b) - -instance Eq Integer where - (==) = eqInteger - (/=) = neqInteger - ------------------------------------------------------------------------- - --- | /Since: 0.5.1.0/ -{-# NOINLINE leInteger# #-} -leInteger# :: Integer -> Integer -> Int# -leInteger# (S# i) (S# j) = i <=# j -leInteger# (J# s d) (S# i) = cmpIntegerInt# s d i <=# 0# -leInteger# (S# i) (J# s d) = cmpIntegerInt# s d i >=# 0# -leInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) <=# 0# - --- | /Since: 0.5.1.0/ -{-# NOINLINE gtInteger# #-} -gtInteger# :: Integer -> Integer -> Int# -gtInteger# (S# i) (S# j) = i ># j -gtInteger# (J# s d) (S# i) = cmpIntegerInt# s d i ># 0# -gtInteger# (S# i) (J# s d) = cmpIntegerInt# s d i <# 0# -gtInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) ># 0# - --- | /Since: 0.5.1.0/ -{-# NOINLINE ltInteger# #-} -ltInteger# :: Integer -> Integer -> Int# -ltInteger# (S# i) (S# j) = i <# j -ltInteger# (J# s d) (S# i) = cmpIntegerInt# s d i <# 0# -ltInteger# (S# i) (J# s d) = cmpIntegerInt# s d i ># 0# -ltInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) <# 0# - --- | /Since: 0.5.1.0/ -{-# NOINLINE geInteger# #-} -geInteger# :: Integer -> Integer -> Int# -geInteger# (S# i) (S# j) = i >=# j -geInteger# (J# s d) (S# i) = cmpIntegerInt# s d i >=# 0# -geInteger# (S# i) (J# s d) = cmpIntegerInt# s d i <=# 0# -geInteger# (J# s1 d1) (J# s2 d2) = (cmpInteger# s1 d1 s2 d2) >=# 0# - -{-# INLINE leInteger #-} -{-# INLINE ltInteger #-} -{-# INLINE geInteger #-} -{-# INLINE gtInteger #-} -leInteger, gtInteger, ltInteger, geInteger :: Integer -> Integer -> Bool -leInteger a b = isTrue# (a `leInteger#` b) -gtInteger a b = isTrue# (a `gtInteger#` b) -ltInteger a b = isTrue# (a `ltInteger#` b) -geInteger a b = isTrue# (a `geInteger#` b) - -{-# NOINLINE compareInteger #-} -compareInteger :: Integer -> Integer -> Ordering -compareInteger (S# i) (S# j) - = if isTrue# (i ==# j) then EQ - else if isTrue# (i <=# j) then LT - else GT -compareInteger (J# s d) (S# i) - = case cmpIntegerInt# s d i of { res# -> - if isTrue# (res# <# 0#) then LT else - if isTrue# (res# ># 0#) then GT else EQ - } -compareInteger (S# i) (J# s d) - = case cmpIntegerInt# s d i of { res# -> - if isTrue# (res# ># 0#) then LT else - if isTrue# (res# <# 0#) then GT else EQ - } -compareInteger (J# s1 d1) (J# s2 d2) - = case cmpInteger# s1 d1 s2 d2 of { res# -> - if isTrue# (res# <# 0#) then LT else - if isTrue# (res# ># 0#) then GT else EQ - } - -instance Ord Integer where - (<=) = leInteger - (<) = ltInteger - (>) = gtInteger - (>=) = geInteger - compare = compareInteger -\end{code} - - -%********************************************************* -%* * -\subsection{The @Integer@ instances for @Num@} -%* * -%********************************************************* - -\begin{code} -{-# NOINLINE absInteger #-} -absInteger :: Integer -> Integer -absInteger (S# INT_MINBOUND) = NEG_INT_MINBOUND -absInteger n@(S# i) = if isTrue# (i >=# 0#) then n else S# (negateInt# i) -absInteger n@(J# s d) = if isTrue# (s >=# 0#) then n else J# (negateInt# s) d - -{-# NOINLINE signumInteger #-} -signumInteger :: Integer -> Integer -signumInteger (S# i) = if isTrue# (i <# 0#) then S# -1# - else if isTrue# (i ==# 0#) then S# 0# - else S# 1# -signumInteger (J# s d) - = let - !cmp = cmpIntegerInt# s d 0# - in - if isTrue# (cmp ># 0#) then S# 1# - else if isTrue# (cmp ==# 0#) then S# 0# - else S# (negateInt# 1#) - -{-# NOINLINE plusInteger #-} -plusInteger :: Integer -> Integer -> Integer -plusInteger (S# i) (S# j) = case addIntC# i j of - (# r, c #) -> - if isTrue# (c ==# 0#) - then S# r -#if SIZEOF_HSWORD == SIZEOF_LONG - else case int2Integer# i of - (# s, d #) -> mpzToInteger (plusIntegerInt# s d j) -#else - else plusInteger (toBig (S# i)) (toBig (S# j)) -#endif -plusInteger i1@(J# _ _) (S# 0#) = i1 -#if SIZEOF_HSWORD == SIZEOF_LONG -plusInteger (J# s1 d1) (S# j) = mpzToInteger (plusIntegerInt# s1 d1 j) -#else -plusInteger i1@(J# _ _) i2@(S# _) = plusInteger i1 (toBig i2) -#endif -plusInteger i1@(S# _) i2@(J# _ _) = plusInteger i2 i1 -plusInteger (J# s1 d1) (J# s2 d2) = mpzToInteger (plusInteger# s1 d1 s2 d2) - -{-# NOINLINE minusInteger #-} -minusInteger :: Integer -> Integer -> Integer -minusInteger (S# i) (S# j) = case subIntC# i j of - (# r, c #) -> - if isTrue# (c ==# 0#) then S# r -#if SIZEOF_HSWORD == SIZEOF_LONG - else case int2Integer# i of - (# s, d #) -> mpzToInteger (minusIntegerInt# s d j) -#else - else minusInteger (toBig (S# i)) (toBig (S# j)) -#endif -minusInteger i1@(J# _ _) (S# 0#) = i1 -minusInteger (S# 0#) (J# s2 d2) = J# (negateInt# s2) d2 -#if SIZEOF_HSWORD == SIZEOF_LONG -minusInteger (J# s1 d1) (S# j) = mpzToInteger (minusIntegerInt# s1 d1 j) -minusInteger (S# i) (J# s2 d2) = mpzToInteger (plusIntegerInt# (negateInt# s2) d2 i) -#else -minusInteger i1@(J# _ _) i2@(S# _) = minusInteger i1 (toBig i2) -minusInteger i1@(S# _) i2@(J# _ _) = minusInteger (toBig i1) i2 -#endif -minusInteger (J# s1 d1) (J# s2 d2) = mpzToInteger (minusInteger# s1 d1 s2 d2) - -{-# NOINLINE timesInteger #-} -timesInteger :: Integer -> Integer -> Integer -timesInteger (S# i) (S# j) = if isTrue# (mulIntMayOflo# i j ==# 0#) - then S# (i *# j) -#if SIZEOF_HSWORD == SIZEOF_LONG - else case int2Integer# i of - (# s, d #) -> mpzToInteger (timesIntegerInt# s d j) -#else - else timesInteger (toBig (S# i)) (toBig (S# j)) -#endif -timesInteger (S# 0#) _ = S# 0# -timesInteger (S# -1#) i2 = negateInteger i2 -timesInteger (S# 1#) i2 = i2 -#if SIZEOF_HSWORD == SIZEOF_LONG -timesInteger (S# i1) (J# s2 d2) = mpzToInteger (timesIntegerInt# s2 d2 i1) -#else -timesInteger i1@(S# _) i2@(J# _ _) = timesInteger (toBig i1) i2 -#endif -timesInteger i1@(J# _ _) i2@(S# _) = timesInteger i2 i1 -- swap args & retry -timesInteger (J# s1 d1) (J# s2 d2) = mpzToInteger (timesInteger# s1 d1 s2 d2) - -{-# NOINLINE negateInteger #-} -negateInteger :: Integer -> Integer -negateInteger (S# INT_MINBOUND) = NEG_INT_MINBOUND -negateInteger (S# i) = S# (negateInt# i) -negateInteger (J# s d) = J# (negateInt# s) d -\end{code} - - -%********************************************************* -%* * -\subsection{The @Integer@ stuff for Double@} -%* * -%********************************************************* - -\begin{code} -{-# NOINLINE encodeFloatInteger #-} -encodeFloatInteger :: Integer -> Int# -> Float# -encodeFloatInteger (S# i) j = int_encodeFloat# i j -encodeFloatInteger (J# s# d#) e = encodeFloat# s# d# e - -{-# NOINLINE encodeDoubleInteger #-} -encodeDoubleInteger :: Integer -> Int# -> Double# -encodeDoubleInteger (S# i) j = int_encodeDouble# i j -encodeDoubleInteger (J# s# d#) e = encodeDouble# s# d# e - -{-# NOINLINE decodeDoubleInteger #-} -decodeDoubleInteger :: Double# -> (# Integer, Int# #) -decodeDoubleInteger d = case decodeDouble# d of - (# exp#, man# #) -> let !man = mpzToInteger man# - in (# man, exp# #) - --- previous code: doubleFromInteger n = fromInteger n = encodeFloat n 0 --- doesn't work too well, because encodeFloat is defined in --- terms of ccalls which can never be simplified away. We --- want simple literals like (fromInteger 3 :: Float) to turn --- into (F# 3.0), hence the special case for S# here. - -{-# NOINLINE doubleFromInteger #-} -doubleFromInteger :: Integer -> Double# -doubleFromInteger (S# i#) = int2Double# i# -doubleFromInteger (J# s# d#) = encodeDouble# s# d# 0# - -{-# NOINLINE floatFromInteger #-} -floatFromInteger :: Integer -> Float# -floatFromInteger (S# i#) = int2Float# i# -floatFromInteger (J# s# d#) = encodeFloat# s# d# 0# - -foreign import ccall unsafe "integer_cbits_encodeFloat" - encodeFloat# :: Int# -> ByteArray# -> Int# -> Float# -foreign import ccall unsafe "__int_encodeFloat" - int_encodeFloat# :: Int# -> Int# -> Float# - -foreign import ccall unsafe "integer_cbits_encodeDouble" - encodeDouble# :: Int# -> ByteArray# -> Int# -> Double# -foreign import ccall unsafe "__int_encodeDouble" - int_encodeDouble# :: Int# -> Int# -> Double# -\end{code} - -%********************************************************* -%* * -\subsection{The @Integer@ Bit definitions@} -%* * -%********************************************************* - -We explicitly pattern match against J# and S# in order to produce -Core that doesn't have pattern matching errors, as that would -introduce a spurious dependency to base. - -\begin{code} -{-# NOINLINE andInteger #-} -andInteger :: Integer -> Integer -> Integer -(S# x) `andInteger` (S# y) = S# (word2Int# (int2Word# x `and#` int2Word# y)) -x@(S# _) `andInteger` y@(J# _ _) = toBig x `andInteger` y -x@(J# _ _) `andInteger` y@(S# _) = x `andInteger` toBig y -(J# s1 d1) `andInteger` (J# s2 d2) = - mpzToInteger (andInteger# s1 d1 s2 d2) - -{-# NOINLINE orInteger #-} -orInteger :: Integer -> Integer -> Integer -(S# x) `orInteger` (S# y) = S# (word2Int# (int2Word# x `or#` int2Word# y)) -x@(S# _) `orInteger` y@(J# _ _) = toBig x `orInteger` y -x@(J# _ _) `orInteger` y@(S# _) = x `orInteger` toBig y -(J# s1 d1) `orInteger` (J# s2 d2) = - mpzToInteger (orInteger# s1 d1 s2 d2) - -{-# NOINLINE xorInteger #-} -xorInteger :: Integer -> Integer -> Integer -(S# x) `xorInteger` (S# y) = S# (word2Int# (int2Word# x `xor#` int2Word# y)) -x@(S# _) `xorInteger` y@(J# _ _) = toBig x `xorInteger` y -x@(J# _ _) `xorInteger` y@(S# _) = x `xorInteger` toBig y -(J# s1 d1) `xorInteger` (J# s2 d2) = - mpzToInteger (xorInteger# s1 d1 s2 d2) - -{-# NOINLINE complementInteger #-} -complementInteger :: Integer -> Integer -complementInteger (S# x) - = S# (word2Int# (int2Word# x `xor#` int2Word# (0# -# 1#))) -complementInteger (J# s d) - = mpzToInteger (complementInteger# s d) - -{-# NOINLINE shiftLInteger #-} -shiftLInteger :: Integer -> Int# -> Integer -shiftLInteger j@(S# _) i = shiftLInteger (toBig j) i -shiftLInteger (J# s d) i = mpzToInteger (mul2ExpInteger# s d i) - -{-# NOINLINE shiftRInteger #-} -shiftRInteger :: Integer -> Int# -> Integer -shiftRInteger j@(S# _) i = shiftRInteger (toBig j) i -shiftRInteger (J# s d) i = mpzToInteger (fdivQ2ExpInteger# s d i) - --- | /Since: 0.5.1.0/ -{-# NOINLINE testBitInteger #-} -testBitInteger :: Integer -> Int# -> Bool -testBitInteger j@(S# _) i = testBitInteger (toBig j) i -testBitInteger (J# s d) i = isTrue# (testBitInteger# s d i /=# 0#) - --- | \"@'powInteger' /b/ /e/@\" computes base @/b/@ raised to exponent @/e/@. --- --- /Since: 0.5.1.0/ -{-# NOINLINE powInteger #-} -powInteger :: Integer -> Word# -> Integer -powInteger j@(S# _) e = powInteger (toBig j) e -powInteger (J# s d) e = mpzToInteger (powInteger# s d e) - --- | \"@'powModInteger' /b/ /e/ /m/@\" computes base @/b/@ raised to --- exponent @/e/@ modulo @/m/@. --- --- Negative exponents are supported if an inverse modulo @/m/@ --- exists. It's advised to avoid calling this primitive with negative --- exponents unless it is guaranteed the inverse exists, as failure to --- do so will likely cause program abortion due to a divide-by-zero --- fault. See also 'recipModInteger'. --- --- /Since: 0.5.1.0/ -{-# NOINLINE powModInteger #-} -powModInteger :: Integer -> Integer -> Integer -> Integer -powModInteger (J# s1 d1) (J# s2 d2) (J# s3 d3) = - mpzToInteger (powModInteger# s1 d1 s2 d2 s3 d3) -powModInteger b e m = powModInteger (toBig b) (toBig e) (toBig m) - --- | \"@'powModSecInteger' /b/ /e/ /m/@\" computes base @/b/@ raised to --- exponent @/e/@ modulo @/m/@. It is required that @/e/ > 0@ and --- @/m/@ is odd. --- --- This is a \"secure\" variant of 'powModInteger' using the --- @mpz_powm_sec()@ function which is designed to be resilient to side --- channel attacks and is therefore intended for cryptographic --- applications. --- --- This primitive is only available when the underlying GMP library --- supports it (GMP >= 5). Otherwise, it internally falls back to --- @'powModInteger'@, and a warning will be emitted when used. --- --- /Since: 0.5.1.0/ -{-# NOINLINE powModSecInteger #-} -powModSecInteger :: Integer -> Integer -> Integer -> Integer -powModSecInteger (J# s1 d1) (J# s2 d2) (J# s3 d3) = - mpzToInteger (powModSecInteger# s1 d1 s2 d2 s3 d3) -powModSecInteger b e m = powModSecInteger (toBig b) (toBig e) (toBig m) - -#if HAVE_SECURE_POWM == 0 -{-# WARNING powModSecInteger "The underlying GMP library does not support a secure version of powModInteger which is side-channel resistant - you need at least GMP version 5 to support this" #-} -#endif - --- | \"@'recipModInteger' /x/ /m/@\" computes the inverse of @/x/@ modulo @/m/@. If --- the inverse exists, the return value @/y/@ will satisfy @0 < /y/ < --- abs(/m/)@, otherwise the result is @0@. --- --- Note: The implementation exploits the undocumented property of --- @mpz_invert()@ to not mangle the result operand (which is initialized --- to 0) in case of non-existence of the inverse. --- --- /Since: 0.5.1.0/ -{-# NOINLINE recipModInteger #-} -recipModInteger :: Integer -> Integer -> Integer -recipModInteger j@(S# _) m@(S# _) = recipModInteger (toBig j) (toBig m) -recipModInteger j@(S# _) m@(J# _ _) = recipModInteger (toBig j) m -recipModInteger j@(J# _ _) m@(S# _) = recipModInteger j (toBig m) -recipModInteger (J# s d) (J# ms md) = mpzToInteger (recipModInteger# s d ms md) - --- | Probalistic Miller-Rabin primality test. --- --- \"@'testPrimeInteger' /n/ /k/@\" determines whether @/n/@ is prime --- and returns one of the following results: --- --- * @2#@ is returned if @/n/@ is definitely prime, --- --- * @1#@ if @/n/@ is a /probable prime/, or --- --- * @0#@ if @/n/@ is definitely not a prime. --- --- The @/k/@ argument controls how many test rounds are performed for --- determining a /probable prime/. For more details, see --- <http://gmplib.org/manual/Number-Theoretic-Functions.html#index-mpz_005fprobab_005fprime_005fp-360 GMP documentation for `mpz_probab_prime_p()`>. --- --- /Since: 0.5.1.0/ -{-# NOINLINE testPrimeInteger #-} -testPrimeInteger :: Integer -> Int# -> Int# -testPrimeInteger j@(S# _) reps = testPrimeInteger (toBig j) reps -testPrimeInteger (J# s d) reps = testPrimeInteger# s d reps - --- | Compute next prime greater than @/n/@ probalistically. --- --- According to the GMP documentation, the underlying function --- @mpz_nextprime()@ \"uses a probabilistic algorithm to identify --- primes. For practical purposes it's adequate, the chance of a --- composite passing will be extremely small.\" --- --- /Since: 0.5.1.0/ -{-# NOINLINE nextPrimeInteger #-} -nextPrimeInteger :: Integer -> Integer -nextPrimeInteger j@(S# _) = nextPrimeInteger (toBig j) -nextPrimeInteger (J# s d) = mpzToInteger (nextPrimeInteger# s d) - --- | Compute number of digits (without sign) in given @/base/@. --- --- It's recommended to avoid calling 'sizeInBaseInteger' for small --- integers as this function would currently convert those to big --- integers in order to call @mpz_sizeinbase()@. --- --- This function wraps @mpz_sizeinbase()@ which has some --- implementation pecularities to take into account: --- --- * \"@'sizeInBaseInteger' 0 /base/ = 1@\" (see also comment in 'exportIntegerToMutableByteArray'). --- --- * This function is only defined if @/base/ >= 2#@ and @/base/ <= 256#@ --- (Note: the documentation claims that only @/base/ <= 62#@ is --- supported, however the actual implementation supports up to base 256). --- --- * If @/base/@ is a power of 2, the result will be exact. In other --- cases (e.g. for @/base/ = 10#@), the result /may/ be 1 digit too large --- sometimes. --- --- * \"@'sizeInBaseInteger' /i/ 2#@\" can be used to determine the most --- significant bit of @/i/@. --- --- /Since: 0.5.1.0/ -{-# NOINLINE sizeInBaseInteger #-} -sizeInBaseInteger :: Integer -> Int# -> Word# -sizeInBaseInteger (J# s d) b = sizeInBaseInteger# s d b -sizeInBaseInteger j@(S# _) b = sizeInBaseInteger (toBig j) b -- TODO - --- | Dump 'Integer' (without sign) to mutable byte-array in base-256 representation. --- --- The call --- --- @'exportIntegerToMutableByteArray' /i/ /mba/ /offset/ /order/@ --- --- writes --- --- * the 'Integer' @/i/@ --- --- * into the 'MutableByteArray#' @/mba/@ starting at @/offset/@ --- --- * with most significant byte first if @order@ is @1#@ or least --- significant byte first if @order@ is @-1#@, and --- --- * returns number of bytes written. --- --- Use \"@'sizeInBaseInteger' /i/ 256#@\" to compute the exact number of --- bytes written in advance for @/i/ /= 0@. In case of @/i/ == 0@, --- 'exportIntegerToMutableByteArray' will write and report zero bytes --- written, whereas 'sizeInBaseInteger' report one byte. --- --- It's recommended to avoid calling 'exportIntegerToMutableByteArray' for small --- integers as this function would currently convert those to big --- integers in order to call @mpz_export()@. --- --- /Since: 0.5.1.0/ -{-# NOINLINE exportIntegerToMutableByteArray #-} -exportIntegerToMutableByteArray :: Integer -> MutableByteArray# s -> Word# -> Int# -> State# s -> (# State# s, Word# #) -exportIntegerToMutableByteArray (J# s d) mba o e = exportIntegerToMutableByteArray# s d mba o e -exportIntegerToMutableByteArray j@(S# _) mba o e = exportIntegerToMutableByteArray (toBig j) mba o e -- TODO - --- | Dump 'Integer' (without sign) to @/addr/@ in base-256 representation. --- --- @'exportIntegerToAddr' /addr/ /o/ /e/@ --- --- See description of 'exportIntegerToMutableByteArray' for more details. --- --- /Since: 0.5.1.0/ -{-# NOINLINE exportIntegerToAddr #-} -exportIntegerToAddr :: Integer -> Addr# -> Int# -> State# s -> (# State# s, Word# #) -exportIntegerToAddr (J# s d) addr o e = exportIntegerToAddr# s d addr o e -exportIntegerToAddr j@(S# _) addr o e = exportIntegerToAddr (toBig j) addr o e -- TODO - --- | Read 'Integer' (without sign) from byte-array in base-256 representation. --- --- The call --- --- @'importIntegerFromByteArray' /ba/ /offset/ /size/ /order/@ --- --- reads --- --- * @/size/@ bytes from the 'ByteArray#' @/ba/@ starting at @/offset/@ --- --- * with most significant byte first if @/order/@ is @1#@ or least --- significant byte first if @/order/@ is @-1#@, and --- --- * returns a new 'Integer' --- --- /Since: 0.5.1.0/ -{-# NOINLINE importIntegerFromByteArray #-} -importIntegerFromByteArray :: ByteArray# -> Word# -> Word# -> Int# -> Integer -importIntegerFromByteArray ba o l e = mpzToInteger (importIntegerFromByteArray# ba o l e) - --- | Read 'Integer' (without sign) from memory location at @/addr/@ in --- base-256 representation. --- --- @'importIntegerFromAddr' /addr/ /size/ /order/@ --- --- See description of 'importIntegerFromByteArray' for more details. --- --- /Since: 0.5.1.0/ -{-# NOINLINE importIntegerFromAddr #-} -importIntegerFromAddr :: Addr# -> Word# -> Int# -> State# s -> (# State# s, Integer #) -importIntegerFromAddr addr l e st = case importIntegerFromAddr# addr l e st of - (# st', mpz #) -> let !j = mpzToInteger mpz in (# st', j #) - -\end{code} - -%********************************************************* -%* * -\subsection{The @Integer@ hashing@} -%* * -%********************************************************* - -\begin{code} --- This is used by hashUnique - --- | 'hashInteger' returns the same value as 'fromIntegral', although in --- unboxed form. It might be a reasonable hash function for 'Integer', --- given a suitable distribution of 'Integer' values. --- --- Note: 'hashInteger' is currently just an alias for 'integerToInt'. - -hashInteger :: Integer -> Int# -hashInteger = integerToInt -\end{code} - diff --git a/libraries/integer-gmp/LICENSE b/libraries/integer-gmp/LICENSE index 7ac76a6db4..0ce51e0bd0 100644 --- a/libraries/integer-gmp/LICENSE +++ b/libraries/integer-gmp/LICENSE @@ -1,62 +1,30 @@ -This library (libraries/integer(-gmp)) is derived from code from several -sources: +Copyright (c) 2014, Herbert Valerio Riedel - * Code from the GHC project which is largely (c) The University of - Glasgow, and distributable under a BSD-style license (see below), - - * Code from the Haskell 98 Report which is (c) Simon Peyton Jones - and freely redistributable (but see the full license for - restrictions). - -The full text of these licenses is reproduced below. All of the -licenses are BSD-style or compatible. - ------------------------------------------------------------------------------ - -The Glasgow Haskell Compiler License - -Copyright 2004, The University Court of the University of Glasgow. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -- Neither name of the University nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF -GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - ------------------------------------------------------------------------------ - -Code derived from the document "Report on the Programming Language -Haskell 98", is distributed under the following license: - - Copyright (c) 2002 Simon Peyton Jones - - The authors intend this Report to belong to the entire Haskell - community, and so we grant permission to copy and distribute it for - any purpose, provided that it is reproduced in its entirety, - including this Notice. Modified versions of this Report may also be - copied and distributed for any purpose, provided that the modified - version is clearly presented as such, and that it does not claim to - be a definition of the Haskell 98 Language. - + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Herbert Valerio Riedel nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libraries/integer-gmp/Setup.hs b/libraries/integer-gmp/Setup.hs index 6fa548caf7..54f57d6f11 100644 --- a/libraries/integer-gmp/Setup.hs +++ b/libraries/integer-gmp/Setup.hs @@ -3,4 +3,4 @@ module Main (main) where import Distribution.Simple main :: IO () -main = defaultMain +main = defaultMainWithHooks autoconfUserHooks diff --git a/libraries/integer-gmp/cbits/alloc.c b/libraries/integer-gmp/cbits/alloc.c deleted file mode 100644 index e7111109c7..0000000000 --- a/libraries/integer-gmp/cbits/alloc.c +++ /dev/null @@ -1,97 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) The GHC Team, 1998-2012 - * - * ---------------------------------------------------------------------------*/ - -#include <string.h> - -#include "Rts.h" - -#include "gmp.h" - -void * stgAllocForGMP (size_t size_in_bytes); -void * stgReallocForGMP (void *ptr, size_t old_size, size_t new_size); -void stgDeallocForGMP (void *ptr STG_UNUSED, size_t size STG_UNUSED); - -static void initAllocForGMP( void ) __attribute__((constructor)); - -/* ----------------------------------------------------------------------------- - Tell GMP to use our custom heap allocation functions. - - Our allocation strategy is to use GHC heap allocations rather than malloc - and co. The heap objects we use are ByteArray#s which of course have their - usual header word or two. But gmp doesn't know about ghc heap objects and - header words. So our allocator has to make a ByteArray# and return a pointer - to its interior! When the gmp function returns we receive that interior - pointer. Then we look back a couple words to get the proper ByteArray# - pointer (which then gets returned as a ByteArray# and thus get tracked - properly by the GC). - - WARNING!! WARNING!! WARNING!! - - It is absolutely vital that this initialisation function be called before - any of the gmp functions are called. We'd still be looking back a couple - words for the ByteArray# header, but if we were accidentally using malloc - then it'd all go wrong because of course there would be no ByteArray# - header, just malloc's own internal book keeping info. To make things worse - we would not notice immediately, it'd only be when the GC comes round to - inspect things... BANG! - - > Program received signal SIGSEGV, Segmentation fault. - > [Switching to Thread 0x7f5a9ebc76f0 (LWP 17838)] - > evacuate1 (p=0x7f5a99acd2e0) at rts/sm/Evac.c:375 - > 375 switch (info->type) { - - -------------------------------------------------------------------------- */ - -static void initAllocForGMP( void ) -{ - mp_set_memory_functions(stgAllocForGMP, stgReallocForGMP, stgDeallocForGMP); -} - - -/* ----------------------------------------------------------------------------- - Allocation functions for GMP. - - These all use the allocate() interface - we can't have any garbage - collection going on during a gmp operation, so we use allocate() - which always succeeds. The gmp operations which might need to - allocate will ask the storage manager (via doYouWantToGC()) whether - a garbage collection is required, in case we get into a loop doing - only allocate() style allocation. - -------------------------------------------------------------------------- */ - -void * -stgAllocForGMP (size_t size_in_bytes) -{ - StgArrWords* arr; - nat data_size_in_words, total_size_in_words; - Capability *cap; - - /* round up to a whole number of words */ - data_size_in_words = ROUNDUP_BYTES_TO_WDS(size_in_bytes); - total_size_in_words = sizeofW(StgArrWords) + data_size_in_words; - - /* allocate and fill it in. */ - cap = rts_unsafeGetMyCapability(); - arr = (StgArrWords *)allocate(cap, total_size_in_words); - SET_ARR_HDR(arr, &stg_ARR_WORDS_info, ((CapabilityPublic*)cap)->r.rCCCS, size_in_bytes); - - /* and return a ptr to the goods inside the array */ - return arr->payload; -} - -void * -stgReallocForGMP (void *ptr, size_t old_size, size_t new_size) -{ - size_t min_size = old_size < new_size ? old_size : new_size; - - return memcpy(stgAllocForGMP(new_size), ptr, min_size); -} - -void -stgDeallocForGMP (void *ptr STG_UNUSED, size_t size STG_UNUSED) -{ - /* easy for us: the garbage collector does the dealloc'n */ -} diff --git a/libraries/integer-gmp/cbits/cbits.c b/libraries/integer-gmp/cbits/cbits.c deleted file mode 100644 index 3d53c6ba62..0000000000 --- a/libraries/integer-gmp/cbits/cbits.c +++ /dev/null @@ -1,14 +0,0 @@ - -/* We combine the C files here. - * - * There is actually a good reason for this, really! - * The alloc file contains a __attribute__((constructor)) function. We must - * have this function in the same .o file as other stuff that actually gets - * used otherwise the static linker doesn't bother to pull in the .o file - * containing the constructor function. While we could just stick them in - * the same .c file that'd be a bit annoying. So we combine them here. - * */ - -#include "alloc.c" -#include "float.c" -#include "longlong.c" diff --git a/libraries/integer-gmp/cbits/float.c b/libraries/integer-gmp/cbits/float.c deleted file mode 100644 index 73a89f577a..0000000000 --- a/libraries/integer-gmp/cbits/float.c +++ /dev/null @@ -1,249 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) Lennart Augustsson - * (c) The GHC Team, 1998-2000 - * - * Support for floating-point <-> gmp integer primitives - * - * ---------------------------------------------------------------------------*/ - -/* TODO: do we need PosixSource.h ? it lives in rts/ not public includes/ */ -/* #include "PosixSource.h" */ -#include "Rts.h" -#include "gmp.h" -#include "GmpDerivedConstants.h" - -#include <math.h> - -#define IEEE_FLOATING_POINT 1 - -/* - * Encoding and decoding Doubles. Code based on the HBC code - * (lib/fltcode.c). - */ - -#define SIZEOF_LIMB_T SIZEOF_MP_LIMB_T - -#if SIZEOF_LIMB_T == 4 -#define GMP_BASE 4294967296.0 -#define LIMBBITS_LOG_2 5 -#elif SIZEOF_LIMB_T == 8 -#define GMP_BASE 18446744073709551616.0 -#define LIMBBITS_LOG_2 6 -#else -#error Cannot cope with SIZEOF_LIMB_T -- please add definition of GMP_BASE -#endif - -#define DNBIGIT ((SIZEOF_DOUBLE+SIZEOF_LIMB_T-1)/SIZEOF_LIMB_T) -#define FNBIGIT ((SIZEOF_FLOAT +SIZEOF_LIMB_T-1)/SIZEOF_LIMB_T) - -#if IEEE_FLOATING_POINT -#define MY_DMINEXP ((DBL_MIN_EXP) - (DBL_MANT_DIG) - 1) -/* DMINEXP is defined in values.h on Linux (for example) */ -#define DHIGHBIT 0x00100000 -#define DMSBIT 0x80000000 - -#define MY_FMINEXP ((FLT_MIN_EXP) - (FLT_MANT_DIG) - 1) -#define FHIGHBIT 0x00800000 -#define FMSBIT 0x80000000 -#endif - -#if defined(WORDS_BIGENDIAN) || defined(FLOAT_WORDS_BIGENDIAN) -#define L 1 -#define H 0 -#else -#define L 0 -#define H 1 -#endif - -#define __abs(a) (( (a) >= 0 ) ? (a) : (-(a))) - -StgDouble -integer_cbits_encodeDouble (I_ size, StgByteArray ba, I_ e) /* result = s * 2^e */ -{ - StgDouble r; - const mp_limb_t *const arr = (const mp_limb_t *)ba; - I_ i; - - /* Convert MP_INT to a double; knows a lot about internal rep! */ - i = __abs(size)-1; - if ((i < 15) || (e >= 0)) /* overflows only if the final result does */ - { - /* This would cause overflow if a large MP_INT is passed, even if the - * exponent would scale it back into range, so we do it only when it's safe. */ - for(r = 0.0; i >= 0; i--) - r = (r * GMP_BASE) + arr[i]; - - } else { /* possibly more than 1024 bits in the MP_INT, but gets scaled down */ - - /* Find the first nonzero limb; normally it would be the first */ - r = 0.0; - while((i >= 0) && (r == 0.0)) - { - r = arr[i--]; - } - if (i >= 0) - r = (r * GMP_BASE) + arr[i]; -#if SIZEOF_LIMB_T < 8 - if (i > 0) - r = (r * GMP_BASE) + arr[--i]; -#endif - /* Now we have at least the 65 leading bits of the MP_INT or all of it. - * Any further bits would be rounded down, so from now on everything is - * multiplication by powers of 2. - * If i is positive, arr contains i limbs we haven't looked at yet, so - * adjust the exponent by i*8*SIZEOF_LIMB_T. Unfortunately, we must - * beware of overflow, so we can't simply add this to e. */ - if (i > 0) - { - /* first add the number of whole limbs that would be cancelled */ - i = i + e / (8 * SIZEOF_LIMB_T); - /* check for overflow */ - if ((i > 0) && ((i >> (8*sizeof(I_) - 1 - LIMBBITS_LOG_2)) > 0)) - { - /* overflow, give e a large dummy value */ - e = 2147483647; - } else { - /* no overflow, get the exact value */ - e = i * (8 * SIZEOF_LIMB_T) + (e % (8 * SIZEOF_LIMB_T)); - } - } - } - - /* Now raise to the exponent */ - if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */ - r = ldexp(r, e); - - /* sign is encoded in the size */ - if (size < 0) - r = -r; - - return r; -} - -StgFloat -integer_cbits_encodeFloat (I_ size, StgByteArray ba, I_ e) /* result = s * 2^e */ -{ - StgFloat r; - const mp_limb_t *arr = (const mp_limb_t *)ba; - I_ i; - - /* Convert MP_INT to a float; knows a lot about internal rep! */ - i = __abs(size)-1; - /* just in case StgFloat is a double, check sizes */ -#if SIZEOF_FLOAT == 4 - if ((i < 2) || (e >= 0)) -#else - if ((i < 15) || (e >= 0)) -#endif - { - for(r = 0.0; i >= 0; i--) - r = (r * GMP_BASE) + arr[i]; - } else { - - /* Find the first nonzero limb; normally it would be the first */ - r = 0.0; - while((i >= 0) && (r == 0.0)) - { - r = arr[i--]; - } - if (i >= 0) - r = (r * GMP_BASE) + arr[i]; -#if (SIZEOF_LIMB_T < 8) && (SIZEOF_FLOAT > 4) - if (i > 0) - r = (r * GMP_BASE) + arr[--i]; -#endif - /* Now we have enough leading bits of the MP_INT. - * Any further bits would be rounded down, so from now on everything is - * multiplication by powers of 2. - * If i is positive, arr contains i limbs we haven't looked at yet, so - * adjust the exponent by i*8*SIZEOF_LIMB_T. Unfortunately, we must - * beware of overflow, so we can't simply add this to e. */ - if (i > 0) - { - /* first add the number of whole limbs that would be cancelled */ - i = i + e / (8 * SIZEOF_LIMB_T); - /* check for overflow */ - if ((i > 0) && ((i >> (8*sizeof(I_) - 1 - LIMBBITS_LOG_2)) > 0)) - { - /* overflow, give e a large dummy value */ - e = 2147483647; - } else { - /* no overflow, get the exact value */ - e = i * (8 * SIZEOF_LIMB_T) + (e % (8 * SIZEOF_LIMB_T)); - } - } - } - - /* Now raise to the exponent */ - if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */ - r = ldexp(r, e); - - /* sign is encoded in the size */ - if (size < 0) - r = -r; - - return r; -} - -/* This only supports IEEE floating point */ - -void -integer_cbits_decodeDouble (MP_INT *man, I_ *exp, StgDouble dbl) -{ - /* Do some bit fiddling on IEEE */ - unsigned int low, high; /* assuming 32 bit ints */ - int sign, iexp; - union { double d; unsigned int i[2]; } u; /* assuming 32 bit ints, 64 bit double */ - - ASSERT(sizeof(unsigned int ) == 4 ); - ASSERT(sizeof(dbl ) == SIZEOF_DOUBLE); - ASSERT(sizeof(man->_mp_d[0]) == SIZEOF_LIMB_T); - ASSERT(DNBIGIT*SIZEOF_LIMB_T >= SIZEOF_DOUBLE); - - u.d = dbl; /* grab chunks of the double */ - low = u.i[L]; - high = u.i[H]; - - /* we know the MP_INT* passed in has size zero, so we realloc - no matter what. - */ - man->_mp_alloc = DNBIGIT; - - if (low == 0 && (high & ~DMSBIT) == 0) { - man->_mp_size = 0; - *exp = 0L; - } else { - man->_mp_size = DNBIGIT; - iexp = ((high >> 20) & 0x7ff) + MY_DMINEXP; - sign = high; - - high &= DHIGHBIT-1; - if (iexp != MY_DMINEXP) /* don't add hidden bit to denorms */ - high |= DHIGHBIT; - else { - iexp++; - /* A denorm, normalize the mantissa */ - while (! (high & DHIGHBIT)) { - high <<= 1; - if (low & DMSBIT) - high++; - low <<= 1; - iexp--; - } - } - *exp = (I_) iexp; -#if DNBIGIT == 2 - man->_mp_d[0] = (mp_limb_t)low; - man->_mp_d[1] = (mp_limb_t)high; -#else -#if DNBIGIT == 1 - man->_mp_d[0] = ((mp_limb_t)high) << 32 | (mp_limb_t)low; -#else -#error Cannot cope with DNBIGIT -#endif -#endif - if (sign < 0) - man->_mp_size = -man->_mp_size; - } -} diff --git a/libraries/integer-gmp/cbits/gmp-wrappers.cmm b/libraries/integer-gmp/cbits/gmp-wrappers.cmm deleted file mode 100644 index a5652511bd..0000000000 --- a/libraries/integer-gmp/cbits/gmp-wrappers.cmm +++ /dev/null @@ -1,823 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) The GHC Team, 1998-2012 - * - * Out-of-line primitive operations - * - * This file contains the implementations of all the primitive - * operations ("primops") which are not expanded inline. See - * ghc/compiler/prelude/primops.txt.pp for a list of all the primops; - * this file contains code for most of those with the attribute - * out_of_line=True. - * - * Entry convention: the entry convention for a primop is that all the - * args are in Stg registers (R1, R2, etc.). This is to make writing - * the primops easier. (see compiler/codeGen/CgCallConv.hs). - * - * Return convention: results from a primop are generally returned - * using the ordinary unboxed tuple return convention. The C-- parser - * implements the RET_xxxx() macros to perform unboxed-tuple returns - * based on the prevailing return convention. - * - * This file is written in a subset of C--, extended with various - * features specific to GHC. It is compiled by GHC directly. For the - * syntax of .cmm files, see the parser in ghc/compiler/cmm/CmmParse.y. - * - * ---------------------------------------------------------------------------*/ - -#include "Cmm.h" -#include "GmpDerivedConstants.h" -#include "HsIntegerGmp.h" - -import "integer-gmp" __gmpz_add; -import "integer-gmp" __gmpz_add_ui; -import "integer-gmp" __gmpz_sub; -import "integer-gmp" __gmpz_sub_ui; -import "integer-gmp" __gmpz_mul; -import "integer-gmp" __gmpz_mul_2exp; -import "integer-gmp" __gmpz_mul_si; -import "integer-gmp" __gmpz_tstbit; -import "integer-gmp" __gmpz_fdiv_q_2exp; -import "integer-gmp" __gmpz_gcd; -import "integer-gmp" __gmpz_gcdext; -import "integer-gmp" __gmpn_gcd_1; -import "integer-gmp" __gmpn_cmp; -import "integer-gmp" __gmpz_tdiv_q; -import "integer-gmp" __gmpz_tdiv_q_ui; -import "integer-gmp" __gmpz_tdiv_r; -import "integer-gmp" __gmpz_tdiv_r_ui; -import "integer-gmp" __gmpz_fdiv_q; -import "integer-gmp" __gmpz_fdiv_q_ui; -import "integer-gmp" __gmpz_fdiv_r; -import "integer-gmp" __gmpz_fdiv_r_ui; -import "integer-gmp" __gmpz_tdiv_qr; -import "integer-gmp" __gmpz_tdiv_qr_ui; -import "integer-gmp" __gmpz_fdiv_qr; -import "integer-gmp" __gmpz_fdiv_qr_ui; -import "integer-gmp" __gmpz_divexact; -import "integer-gmp" __gmpz_divexact_ui; -import "integer-gmp" __gmpz_and; -import "integer-gmp" __gmpz_xor; -import "integer-gmp" __gmpz_ior; -import "integer-gmp" __gmpz_com; -import "integer-gmp" __gmpz_pow_ui; -import "integer-gmp" __gmpz_powm; -#if HAVE_SECURE_POWM == 1 -import "integer-gmp" __gmpz_powm_sec; -#endif -import "integer-gmp" __gmpz_invert; -import "integer-gmp" __gmpz_nextprime; -import "integer-gmp" __gmpz_probab_prime_p; -import "integer-gmp" __gmpz_sizeinbase; -import "integer-gmp" __gmpz_import; -import "integer-gmp" __gmpz_export; - -import "integer-gmp" integer_cbits_decodeDouble; - -import "rts" stg_INTLIKE_closure; - -/* ----------------------------------------------------------------------------- - Arbitrary-precision Integer operations. - - There are some assumptions in this code that mp_limb_t == W_. This is - the case for all the platforms that GHC supports, currently. - -------------------------------------------------------------------------- */ - -#if SIZEOF_MP_LIMB_T != SIZEOF_W -#error "sizeof(mp_limb_t) != sizeof(W_)" -#endif - -/* This is used when a dummy pointer is needed for a ByteArray# return value - - Ideally this would be a statically allocated 'ByteArray#' - containing SIZEOF_W 0-bytes. However, since in those cases when a - dummy value is needed, the 'ByteArray#' is not supposed to be - accessed anyway, this is should be a tolerable hack. - */ -#define DUMMY_BYTE_ARR (stg_INTLIKE_closure+1) - -/* set mpz_t from Int#/ByteArray# */ -#define MP_INT_SET_FROM_BA(mp_ptr,i,ba) \ - MP_INT__mp_alloc(mp_ptr) = W_TO_INT(BYTE_ARR_WDS(ba)); \ - MP_INT__mp_size(mp_ptr) = W_TO_INT(i); \ - MP_INT__mp_d(mp_ptr) = BYTE_ARR_CTS(ba) - -/* convert mpz_t to Int#/ByteArray# return pair */ -#define MP_INT_AS_PAIR(mp_ptr) \ - TO_W_(MP_INT__mp_size(mp_ptr)),(MP_INT__mp_d(mp_ptr)-SIZEOF_StgArrWords) - -#define MP_INT_TO_BA(mp_ptr) \ - (MP_INT__mp_d(mp_ptr)-SIZEOF_StgArrWords) - -/* Size of mpz_t with single limb */ -#define SIZEOF_MP_INT_1LIMB (SIZEOF_MP_INT+WDS(1)) - -/* Initialize 0-valued single-limb mpz_t at mp_ptr */ -#define MP_INT_1LIMB_INIT0(mp_ptr) \ - MP_INT__mp_alloc(mp_ptr) = W_TO_INT(1); \ - MP_INT__mp_size(mp_ptr) = W_TO_INT(0); \ - MP_INT__mp_d(mp_ptr) = (mp_ptr+SIZEOF_MP_INT) - - -/* return mpz_t as (# s::Int#, d::ByteArray#, l1::Word# #) tuple - * - * semantics: - * - * (# 0, _, 0 #) -> value = 0 - * (# 1, _, w #) -> value = w - * (# -1, _, w #) -> value = -w - * (# s, d, 0 #) -> value = J# s d - * - */ -#define MP_INT_1LIMB_RETURN(mp_ptr) \ - CInt __mp_s; \ - __mp_s = MP_INT__mp_size(mp_ptr); \ - \ - if (__mp_s == W_TO_INT(0)) \ - { \ - return (0,DUMMY_BYTE_ARR,0); \ - } \ - \ - if (__mp_s == W_TO_INT(-1) || __mp_s == W_TO_INT(1)) \ - { \ - return (TO_W_(__mp_s),DUMMY_BYTE_ARR,W_[MP_INT__mp_d(mp_ptr)]); \ - } \ - \ - return (TO_W_(__mp_s),MP_INT_TO_BA(mp_ptr),0) - -/* Helper macro used by MP_INT_1LIMB_RETURN2 */ -#define MP_INT_1LIMB_AS_TUP3(s,d,w,mp_ptr) \ - CInt s; P_ d; W_ w; \ - s = MP_INT__mp_size(mp_ptr); \ - \ - if (s == W_TO_INT(0)) \ - { \ - d = DUMMY_BYTE_ARR; w = 0; \ - } else { \ - if (s == W_TO_INT(-1) || s == W_TO_INT(1)) \ - { \ - d = DUMMY_BYTE_ARR; w = W_[MP_INT__mp_d(mp_ptr)]; \ - } else { \ - d = MP_INT_TO_BA(mp_ptr); w = 0; \ - } \ - } - -#define MP_INT_1LIMB_RETURN2(mp_ptr1,mp_ptr2) \ - MP_INT_1LIMB_AS_TUP3(__r1s,__r1d,__r1w,mp_ptr1); \ - MP_INT_1LIMB_AS_TUP3(__r2s,__r2d,__r2w,mp_ptr2); \ - return (TO_W_(__r1s),__r1d,__r1w, TO_W_(__r2s),__r2d,__r2w) - -/* :: ByteArray# -> Word# -> Word# -> Int# -> (# Int#, ByteArray#, Word# #) */ -integer_cmm_importIntegerFromByteArrayzh (P_ ba, W_ of, W_ sz, W_ e) -{ - W_ src_ptr; - W_ mp_result; - -again: - STK_CHK_GEN_N (SIZEOF_MP_INT_1LIMB); - MAYBE_GC(again); - - mp_result = Sp - SIZEOF_MP_INT_1LIMB; - MP_INT_1LIMB_INIT0(mp_result); - - src_ptr = BYTE_ARR_CTS(ba) + of; - - ccall __gmpz_import(mp_result "ptr", sz, W_TO_INT(e), W_TO_INT(1), W_TO_INT(0), 0, src_ptr "ptr"); - - MP_INT_1LIMB_RETURN(mp_result); -} - -/* :: Addr# -> Word# -> Int# -> State# s -> (# State# s, Int#, ByteArray#, Word# #) */ -integer_cmm_importIntegerFromAddrzh (W_ src_ptr, W_ sz, W_ e) -{ - W_ mp_result; - -again: - STK_CHK_GEN_N (SIZEOF_MP_INT_1LIMB); - MAYBE_GC(again); - - mp_result = Sp - SIZEOF_MP_INT_1LIMB; - - MP_INT_1LIMB_INIT0(mp_result); - - ccall __gmpz_import(mp_result "ptr", sz, W_TO_INT(e), W_TO_INT(1), W_TO_INT(0), 0, src_ptr "ptr"); - - MP_INT_1LIMB_RETURN(mp_result); -} - -/* :: Int# -> ByteArray# -> MutableByteArray# s -> Word# -> Int# -> State# s -> (# State# s, Word# #) */ -integer_cmm_exportIntegerToMutableByteArrayzh (W_ ws1, P_ d1, P_ mba, W_ of, W_ e) -{ - W_ dst_ptr; - W_ mp_tmp; - W_ cnt_result; - -again: - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_W); - MAYBE_GC(again); - - mp_tmp = Sp - SIZEOF_MP_INT; - MP_INT_SET_FROM_BA(mp_tmp, ws1, d1); - - cnt_result = Sp - (SIZEOF_MP_INT + SIZEOF_W); - W_[cnt_result] = 0; - - dst_ptr = BYTE_ARR_CTS(mba) + of; - - ccall __gmpz_export(dst_ptr "ptr", cnt_result "ptr", W_TO_INT(e), W_TO_INT(1), W_TO_INT(0), 0, mp_tmp "ptr"); - - return (W_[cnt_result]); -} - -/* :: Int# -> ByteArray# -> Addr# -> Int# -> State# s -> (# State# s, Word# #) */ -integer_cmm_exportIntegerToAddrzh (W_ ws1, P_ d1, W_ dst_ptr, W_ e) -{ - W_ mp_tmp; - W_ cnt_result; - -again: - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_W); - MAYBE_GC(again); - - mp_tmp = Sp - SIZEOF_MP_INT; - MP_INT_SET_FROM_BA(mp_tmp, ws1, d1); - - cnt_result = Sp - (SIZEOF_MP_INT + SIZEOF_W); - W_[cnt_result] = 0; - - ccall __gmpz_export(dst_ptr "ptr", cnt_result "ptr", W_TO_INT(e), W_TO_INT(1), W_TO_INT(0), 0, mp_tmp "ptr"); - - return (W_[cnt_result]); -} - -integer_cmm_int2Integerzh (W_ val) -{ - W_ s, p; /* to avoid aliasing */ - - ALLOC_PRIM_N (SIZEOF_StgArrWords + WDS(1), integer_cmm_int2Integerzh, val); - - p = Hp - SIZEOF_StgArrWords; - SET_HDR(p, stg_ARR_WORDS_info, CCCS); - StgArrWords_bytes(p) = SIZEOF_W; - - /* mpz_set_si is inlined here, makes things simpler */ - if (%lt(val,0)) { - s = -1; - Hp(0) = -val; - } else { - if (%gt(val,0)) { - s = 1; - Hp(0) = val; - } else { - s = 0; - } - } - - /* returns (# size :: Int#, - data :: ByteArray# - #) - */ - return (s,p); -} - -integer_cmm_word2Integerzh (W_ val) -{ - W_ s, p; /* to avoid aliasing */ - - ALLOC_PRIM_N (SIZEOF_StgArrWords + WDS(1), integer_cmm_word2Integerzh, val); - - p = Hp - SIZEOF_StgArrWords; - SET_HDR(p, stg_ARR_WORDS_info, CCCS); - StgArrWords_bytes(p) = SIZEOF_W; - - if (val != 0) { - s = 1; - W_[Hp] = val; - } else { - s = 0; - } - - /* returns (# size :: Int#, - data :: ByteArray# #) - */ - return (s,p); -} - - -/* - * 'long long' primops for converting to/from Integers. - */ - -#if WORD_SIZE_IN_BITS < 64 - -integer_cmm_int64ToIntegerzh (L_ val) -{ - W_ hi, lo, s, neg, words_needed, p; - - neg = 0; - - hi = TO_W_(val >> 32); - lo = TO_W_(val); - - if ( hi == 0 || (hi == 0xFFFFFFFF && lo != 0) ) { - // minimum is one word - words_needed = 1; - } else { - words_needed = 2; - } - - ALLOC_PRIM (SIZEOF_StgArrWords + WDS(words_needed)); - - p = Hp - SIZEOF_StgArrWords - WDS(words_needed) + WDS(1); - SET_HDR(p, stg_ARR_WORDS_info, CCCS); - StgArrWords_bytes(p) = WDS(words_needed); - - if ( %lt(hi,0) ) { - neg = 1; - lo = -lo; - if(lo == 0) { - hi = -hi; - } else { - hi = -hi - 1; - } - } - - if ( words_needed == 2 ) { - s = 2; - Hp(-1) = lo; - Hp(0) = hi; - } else { - if ( lo != 0 ) { - s = 1; - Hp(0) = lo; - } else /* val==0 */ { - s = 0; - } - } - if ( neg != 0 ) { - s = -s; - } - - /* returns (# size :: Int#, - data :: ByteArray# #) - */ - return (s,p); -} -integer_cmm_word64ToIntegerzh (L_ val) -{ - W_ hi, lo, s, words_needed, p; - - hi = TO_W_(val >> 32); - lo = TO_W_(val); - - if ( hi != 0 ) { - words_needed = 2; - } else { - words_needed = 1; - } - - ALLOC_PRIM (SIZEOF_StgArrWords + WDS(words_needed)); - - p = Hp - SIZEOF_StgArrWords - WDS(words_needed) + WDS(1); - SET_HDR(p, stg_ARR_WORDS_info, CCCS); - StgArrWords_bytes(p) = WDS(words_needed); - - if ( hi != 0 ) { - s = 2; - Hp(-1) = lo; - Hp(0) = hi; - } else { - if ( lo != 0 ) { - s = 1; - Hp(0) = lo; - } else /* val==0 */ { - s = 0; - } - } - - /* returns (# size :: Int#, - data :: ByteArray# #) - */ - return (s,p); -} - -#endif /* WORD_SIZE_IN_BITS < 64 */ - -#define GMP_TAKE2_RET1(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ ws2, P_ d2) \ -{ \ - W_ mp_tmp1; \ - W_ mp_tmp2; \ - W_ mp_result1; \ - \ -again: \ - STK_CHK_GEN_N (2*SIZEOF_MP_INT + SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp1 = Sp - 1*SIZEOF_MP_INT; \ - mp_tmp2 = Sp - 2*SIZEOF_MP_INT; \ - mp_result1 = Sp - 2*SIZEOF_MP_INT - SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp1,ws1,d1); \ - MP_INT_SET_FROM_BA(mp_tmp2,ws2,d2); \ - \ - MP_INT_1LIMB_INIT0(mp_result1); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result1 "ptr",mp_tmp1 "ptr",mp_tmp2 "ptr"); \ - \ - MP_INT_1LIMB_RETURN(mp_result1); \ -} - -#define GMP_TAKE3_RET1(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ ws2, P_ d2, W_ ws3, P_ d3) \ -{ \ - W_ mp_tmp1; \ - W_ mp_tmp2; \ - W_ mp_tmp3; \ - W_ mp_result1; \ - \ -again: \ - STK_CHK_GEN_N (3*SIZEOF_MP_INT + SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp1 = Sp - 1*SIZEOF_MP_INT; \ - mp_tmp2 = Sp - 2*SIZEOF_MP_INT; \ - mp_tmp3 = Sp - 3*SIZEOF_MP_INT; \ - mp_result1 = Sp - 3*SIZEOF_MP_INT - SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp1,ws1,d1); \ - MP_INT_SET_FROM_BA(mp_tmp2,ws2,d2); \ - MP_INT_SET_FROM_BA(mp_tmp3,ws3,d3); \ - \ - MP_INT_1LIMB_INIT0(mp_result1); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result1 "ptr", \ - mp_tmp1 "ptr", mp_tmp2 "ptr", mp_tmp3 "ptr"); \ - \ - MP_INT_1LIMB_RETURN(mp_result1); \ -} - -#define GMP_TAKE1_UL1_RET1(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ wul) \ -{ \ - W_ mp_tmp; \ - W_ mp_result; \ - \ - /* call doYouWantToGC() */ \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp = Sp - SIZEOF_MP_INT; \ - mp_result = Sp - SIZEOF_MP_INT - SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp,ws1,d1); \ - \ - MP_INT_1LIMB_INIT0(mp_result); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result "ptr", mp_tmp "ptr", W_TO_LONG(wul)); \ - \ - MP_INT_1LIMB_RETURN(mp_result); \ -} - -#define GMP_TAKE1_I1_RETI1(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ wi) \ -{ \ - CInt res; \ - W_ mp_tmp; \ - \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT); \ - MAYBE_GC(again); \ - \ - mp_tmp = Sp - 1 * SIZEOF_MP_INT; \ - MP_INT_SET_FROM_BA(mp_tmp,ws1,d1); \ - \ - /* Perform the operation */ \ - (res) = ccall mp_fun(mp_tmp "ptr", W_TO_INT(wi)); \ - \ - return (TO_W_(res)); \ -} - -#define GMP_TAKE1_UL1_RETI1(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ wul) \ -{ \ - CInt res; \ - W_ mp_tmp; \ - \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT); \ - MAYBE_GC(again); \ - \ - mp_tmp = Sp - 1 * SIZEOF_MP_INT; \ - MP_INT_SET_FROM_BA(mp_tmp,ws1,d1); \ - \ - /* Perform the operation */ \ - (res) = ccall mp_fun(mp_tmp "ptr", W_TO_LONG(wul)); \ - \ - return (TO_W_(res)); \ -} - -#define GMP_TAKE1_RET1(name,mp_fun) \ -name (W_ ws1, P_ d1) \ -{ \ - W_ mp_tmp1; \ - W_ mp_result1; \ - \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp1 = Sp - SIZEOF_MP_INT; \ - mp_result1 = Sp - SIZEOF_MP_INT - SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp1,ws1,d1); \ - \ - MP_INT_1LIMB_INIT0(mp_result1); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result1 "ptr",mp_tmp1 "ptr"); \ - \ - MP_INT_1LIMB_RETURN(mp_result1); \ -} - -#define GMP_TAKE2_RET2(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ ws2, P_ d2) \ -{ \ - W_ mp_tmp1; \ - W_ mp_tmp2; \ - W_ mp_result1; \ - W_ mp_result2; \ - \ -again: \ - STK_CHK_GEN_N (2*SIZEOF_MP_INT + 2*SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp1 = Sp - 1*SIZEOF_MP_INT; \ - mp_tmp2 = Sp - 2*SIZEOF_MP_INT; \ - mp_result1 = Sp - 2*SIZEOF_MP_INT - 1*SIZEOF_MP_INT_1LIMB; \ - mp_result2 = Sp - 2*SIZEOF_MP_INT - 2*SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp1,ws1,d1); \ - MP_INT_SET_FROM_BA(mp_tmp2,ws2,d2); \ - \ - MP_INT_1LIMB_INIT0(mp_result1); \ - MP_INT_1LIMB_INIT0(mp_result2); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result1 "ptr", mp_result2 "ptr", \ - mp_tmp1 "ptr", mp_tmp2 "ptr"); \ - \ - MP_INT_1LIMB_RETURN2(mp_result1, mp_result2); \ -} - -#define GMP_TAKE1_UL1_RET2(name,mp_fun) \ -name (W_ ws1, P_ d1, W_ wul2) \ -{ \ - W_ mp_tmp1; \ - W_ mp_result1; \ - W_ mp_result2; \ - \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT + 2*SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp1 = Sp - SIZEOF_MP_INT; \ - mp_result1 = Sp - SIZEOF_MP_INT - 1*SIZEOF_MP_INT_1LIMB; \ - mp_result2 = Sp - SIZEOF_MP_INT - 2*SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp1,ws1,d1); \ - \ - MP_INT_1LIMB_INIT0(mp_result1); \ - MP_INT_1LIMB_INIT0(mp_result2); \ - \ - /* Perform the operation */ \ - ccall mp_fun(mp_result1 "ptr", mp_result2 "ptr", \ - mp_tmp1 "ptr", W_TO_LONG(wul2)); \ - \ - MP_INT_1LIMB_RETURN2(mp_result1, mp_result2); \ -} - -GMP_TAKE2_RET1(integer_cmm_plusIntegerzh, __gmpz_add) -GMP_TAKE2_RET1(integer_cmm_minusIntegerzh, __gmpz_sub) -GMP_TAKE2_RET1(integer_cmm_timesIntegerzh, __gmpz_mul) -GMP_TAKE1_UL1_RET1(integer_cmm_timesIntegerIntzh, __gmpz_mul_si) -GMP_TAKE2_RET1(integer_cmm_gcdIntegerzh, __gmpz_gcd) -#define CMM_GMPZ_GCDEXT(g,s,a,b) __gmpz_gcdext(g,s,NULL,a,b) -GMP_TAKE2_RET2(integer_cmm_gcdExtIntegerzh, CMM_GMPZ_GCDEXT) -GMP_TAKE2_RET1(integer_cmm_quotIntegerzh, __gmpz_tdiv_q) -GMP_TAKE1_UL1_RET1(integer_cmm_quotIntegerWordzh, __gmpz_tdiv_q_ui) -GMP_TAKE2_RET1(integer_cmm_remIntegerzh, __gmpz_tdiv_r) -GMP_TAKE1_UL1_RET1(integer_cmm_remIntegerWordzh, __gmpz_tdiv_r_ui) -GMP_TAKE2_RET1(integer_cmm_divIntegerzh, __gmpz_fdiv_q) -GMP_TAKE1_UL1_RET1(integer_cmm_divIntegerWordzh, __gmpz_fdiv_q_ui) -GMP_TAKE2_RET1(integer_cmm_modIntegerzh, __gmpz_fdiv_r) -GMP_TAKE1_UL1_RET1(integer_cmm_modIntegerWordzh, __gmpz_fdiv_r_ui) -GMP_TAKE2_RET1(integer_cmm_divExactIntegerzh, __gmpz_divexact) -GMP_TAKE1_UL1_RET1(integer_cmm_divExactIntegerWordzh, __gmpz_divexact_ui) -GMP_TAKE2_RET1(integer_cmm_andIntegerzh, __gmpz_and) -GMP_TAKE2_RET1(integer_cmm_orIntegerzh, __gmpz_ior) -GMP_TAKE2_RET1(integer_cmm_xorIntegerzh, __gmpz_xor) -GMP_TAKE1_UL1_RETI1(integer_cmm_testBitIntegerzh, __gmpz_tstbit) -GMP_TAKE1_UL1_RET1(integer_cmm_mul2ExpIntegerzh, __gmpz_mul_2exp) -GMP_TAKE1_UL1_RET1(integer_cmm_fdivQ2ExpIntegerzh, __gmpz_fdiv_q_2exp) -GMP_TAKE1_RET1(integer_cmm_complementIntegerzh, __gmpz_com) - -GMP_TAKE2_RET2(integer_cmm_quotRemIntegerzh, __gmpz_tdiv_qr) -GMP_TAKE1_UL1_RET2(integer_cmm_quotRemIntegerWordzh,__gmpz_tdiv_qr_ui) -GMP_TAKE2_RET2(integer_cmm_divModIntegerzh, __gmpz_fdiv_qr) -GMP_TAKE1_UL1_RET2(integer_cmm_divModIntegerWordzh, __gmpz_fdiv_qr_ui) - -GMP_TAKE3_RET1(integer_cmm_powModIntegerzh, __gmpz_powm) -#if HAVE_SECURE_POWM == 1 -GMP_TAKE3_RET1(integer_cmm_powModSecIntegerzh, __gmpz_powm_sec) -#else -GMP_TAKE3_RET1(integer_cmm_powModSecIntegerzh, __gmpz_powm) -#endif - -GMP_TAKE2_RET1(integer_cmm_recipModIntegerzh, __gmpz_invert) -GMP_TAKE1_UL1_RET1(integer_cmm_powIntegerzh, __gmpz_pow_ui) - -GMP_TAKE1_RET1(integer_cmm_nextPrimeIntegerzh, __gmpz_nextprime) -GMP_TAKE1_I1_RETI1(integer_cmm_testPrimeIntegerzh, __gmpz_probab_prime_p) - -GMP_TAKE1_I1_RETI1(integer_cmm_sizeInBasezh, __gmpz_sizeinbase) - -integer_cmm_gcdIntzh (W_ int1, W_ int2) -{ - W_ r; - W_ mp_tmp_w; - - STK_CHK_GEN_N (1 * SIZEOF_W); - - mp_tmp_w = Sp - 1 * SIZEOF_W; - - W_[mp_tmp_w] = int1; - (r) = ccall __gmpn_gcd_1(mp_tmp_w "ptr", 1, int2); - - return (r); -} - - -integer_cmm_gcdIntegerIntzh (W_ s1, P_ d1, W_ int) -{ - W_ r; - (r) = ccall __gmpn_gcd_1 (BYTE_ARR_CTS(d1) "ptr", s1, int); - return (r); -} - - -integer_cmm_cmpIntegerIntzh (W_ usize, P_ d1, W_ v_digit) -{ - W_ vsize, u_digit; - - vsize = 0; - - // paraphrased from __gmpz_cmp_si() in the GMP sources - if (%gt(v_digit,0)) { - vsize = 1; - } else { - if (%lt(v_digit,0)) { - vsize = -1; - v_digit = -v_digit; - } - } - - if (usize != vsize) { - return (usize - vsize); - } - - if (usize == 0) { - return (0); - } - - u_digit = W_[BYTE_ARR_CTS(d1)]; - - if (u_digit == v_digit) { - return (0); - } - - if (%gtu(u_digit,v_digit)) { // NB. unsigned: these are mp_limb_t's - return (usize); - } else { - return (-usize); - } -} - -integer_cmm_cmpIntegerzh (W_ usize, P_ d1, W_ vsize, P_ d2) -{ - W_ size, up, vp; - CInt cmp; - - // paraphrased from __gmpz_cmp() in the GMP sources - - if (usize != vsize) { - return (usize - vsize); - } - - if (usize == 0) { - return (0); - } - - if (%lt(usize,0)) { // NB. not <, which is unsigned - size = -usize; - } else { - size = usize; - } - - up = BYTE_ARR_CTS(d1); - vp = BYTE_ARR_CTS(d2); - - (cmp) = ccall __gmpn_cmp(up "ptr", vp "ptr", size); - - if (cmp == 0 :: CInt) { - return (0); - } - - if (%lt(cmp,0 :: CInt) == %lt(usize,0)) { - return (1); - } else { - return (-1); - } -} - -#define DOUBLE_MANTISSA_SIZE SIZEOF_DOUBLE -#define ARR_SIZE (SIZEOF_StgArrWords + DOUBLE_MANTISSA_SIZE) - -integer_cmm_decodeDoublezh (D_ arg) -{ - W_ mp_tmp1; - W_ mp_tmp_w; - -#if SIZEOF_DOUBLE != SIZEOF_W - W_ p; - - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_W); - ALLOC_PRIM (ARR_SIZE); - - mp_tmp1 = Sp - SIZEOF_MP_INT; - mp_tmp_w = Sp - SIZEOF_MP_INT - SIZEOF_W; - - /* Be prepared to tell Lennart-coded integer_cbits_decodeDouble - where mantissa.d can be put (it does not care about the rest) */ - p = Hp - ARR_SIZE + WDS(1); - SET_HDR(p, stg_ARR_WORDS_info, CCCS); - StgArrWords_bytes(p) = DOUBLE_MANTISSA_SIZE; - MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(p); - -#else - /* When SIZEOF_DOUBLE == SIZEOF_W == 8, the result will fit into a - single 8-byte limb, and so we avoid allocating on the Heap and - use only the Stack instead */ - - STK_CHK_GEN_N (SIZEOF_MP_INT_1LIMB + SIZEOF_W); - - mp_tmp1 = Sp - SIZEOF_MP_INT_1LIMB; - mp_tmp_w = Sp - SIZEOF_MP_INT_1LIMB - SIZEOF_W; - - MP_INT_1LIMB_INIT0(mp_tmp1); -#endif - - /* Perform the operation */ - ccall integer_cbits_decodeDouble(mp_tmp1 "ptr", mp_tmp_w "ptr", arg); - - /* returns: (Int# (expn), MPZ#) */ - MP_INT_1LIMB_AS_TUP3(r1s, r1d, r1w, mp_tmp1); - - return (W_[mp_tmp_w], TO_W_(r1s), r1d, r1w); -} - -/* :: Int# -> ByteArray# -> Int# -> (# Int#, ByteArray#, Word# #) */ -#define GMPX_TAKE1_UL1_RET1(name,pos_arg_fun,neg_arg_fun) \ -name(W_ ws1, P_ d1, W_ wl) \ -{ \ - W_ mp_tmp; \ - W_ mp_result; \ - \ -again: \ - STK_CHK_GEN_N (SIZEOF_MP_INT + SIZEOF_MP_INT_1LIMB); \ - MAYBE_GC(again); \ - \ - mp_tmp = Sp - SIZEOF_MP_INT; \ - mp_result = Sp - SIZEOF_MP_INT - SIZEOF_MP_INT_1LIMB; \ - \ - MP_INT_SET_FROM_BA(mp_tmp,ws1,d1); \ - \ - MP_INT_1LIMB_INIT0(mp_result); \ - \ - if(%lt(wl,0)) { \ - ccall neg_arg_fun(mp_result "ptr", mp_tmp "ptr", W_TO_LONG(-wl)); \ - } else { \ - ccall pos_arg_fun(mp_result "ptr", mp_tmp "ptr", W_TO_LONG(wl)); \ - } \ - \ - MP_INT_1LIMB_RETURN(mp_result); \ -} - -/* NB: We need both primitives as we can't express 'minusIntegerInt#' - in terms of 'plusIntegerInt#' for @minBound :: Int@ */ -GMPX_TAKE1_UL1_RET1(integer_cmm_plusIntegerIntzh,__gmpz_add_ui,__gmpz_sub_ui) -GMPX_TAKE1_UL1_RET1(integer_cmm_minusIntegerIntzh,__gmpz_sub_ui,__gmpz_add_ui) diff --git a/libraries/integer-gmp/cbits/longlong.c b/libraries/integer-gmp/cbits/longlong.c deleted file mode 100644 index 1bf101819c..0000000000 --- a/libraries/integer-gmp/cbits/longlong.c +++ /dev/null @@ -1,66 +0,0 @@ -/* ----------------------------------------------------------------------------- - * $Id: longlong.c,v 1.4 2002/12/13 14:23:42 simonmar Exp $ - * - * (c) The GHC Team, 1998-1999 - * - * Primitive operations over (64-bit) long longs - * (only used on 32-bit platforms.) - * - * ---------------------------------------------------------------------------*/ - - -/* -Primitive Integer conversions to/from HsInt64 and HsWord64s. -N.B. These are not primops! - -Instead of going the normal (boring) route of making the list -of primitive operations even longer to cope with operations -over 64-bit entities, we implement them instead 'out-of-line'. - -The primitive ops get their own routine (in C) that implements -the operation, requiring the caller to _ccall_ out. This has -performance implications of course, but we currently don't -expect intensive use of either Int64 or Word64 types. -*/ - -#include "Rts.h" - -#if WORD_SIZE_IN_BITS < 64 - -HsWord64 hs_integerToWord64 (HsInt sa, StgByteArray /* Really: mp_limb_t* */ da) -{ - mp_limb_t* d; - HsInt s; - HsWord64 res; - d = (mp_limb_t *)da; - s = sa; - switch (s) { - case 0: res = 0; break; - case 1: res = d[0]; break; - case -1: res = -(HsWord64)d[0]; break; - default: - res = (HsWord64)d[0] + ((HsWord64)d[1] << (BITS_IN (mp_limb_t))); - if (s < 0) res = -res; - } - return res; -} - -HsInt64 hs_integerToInt64 (HsInt sa, StgByteArray /* Really: mp_limb_t* */ da) -{ - mp_limb_t* d; - HsInt s; - HsInt64 res; - d = (mp_limb_t *)da; - s = (sa); - switch (s) { - case 0: res = 0; break; - case 1: res = d[0]; break; - case -1: res = -(HsInt64)d[0]; break; - default: - res = (HsInt64)d[0] + ((HsWord64)d[1] << (BITS_IN (mp_limb_t))); - if (s < 0) res = -res; - } - return res; -} - -#endif /* WORD_SIZE_IN_BITS < 64 */ diff --git a/libraries/integer-gmp2/cbits/wrappers.c b/libraries/integer-gmp/cbits/wrappers.c index 1736efdc5c..1736efdc5c 100644 --- a/libraries/integer-gmp2/cbits/wrappers.c +++ b/libraries/integer-gmp/cbits/wrappers.c diff --git a/libraries/integer-gmp/changelog.md b/libraries/integer-gmp/changelog.md index 28e662bcea..cb55b80e95 100644 --- a/libraries/integer-gmp/changelog.md +++ b/libraries/integer-gmp/changelog.md @@ -1,5 +1,12 @@ # Changelog for [`integer-gmp` package](http://hackage.haskell.org/package/integer-gmp) +## 1.0.0.0 *Mar 2015* + + * Bundled with GHC 7.10.1 + + * Complete rewrite of `integer-gmp`. For more details, see + https://ghc.haskell.org/trac/ghc/wiki/Design/IntegerGmp2 + ## 0.5.1.0 *Feb 2014* * Bundled with GHC 7.8.1 diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac index d5eb3b23d3..0bd91887b8 100644 --- a/libraries/integer-gmp/configure.ac +++ b/libraries/integer-gmp/configure.ac @@ -1,7 +1,8 @@ -AC_INIT([Haskell integer (GMP)], [0.1], [libraries@haskell.org], [integer]) +AC_INIT([Haskell integer (GMP)], [1.0], [libraries@haskell.org], [integer]) +AC_PREREQ(2.52) # Safety check: Ensure that we are in the correct source directory. -AC_CONFIG_SRCDIR([cbits/gmp-wrappers.cmm]) +AC_CONFIG_SRCDIR([cbits/wrappers.c]) AC_CANONICAL_TARGET @@ -60,11 +61,36 @@ then LOOK_FOR_GMP_FRAMEWORK fi fi + +AC_MSG_CHECKING([whether to use in-tree GMP]) if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES" then + AC_MSG_RESULT([no]) + UseIntreeGmp=0 AC_CHECK_HEADER([gmp.h], , [AC_MSG_ERROR([Cannot find gmp.h])]) + + AC_MSG_CHECKING([GMP version]) + AC_COMPUTE_INT(GhcGmpVerMj, __GNU_MP_VERSION, [#include <gmp.h>], + AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION])) + AC_COMPUTE_INT(GhcGmpVerMi, __GNU_MP_VERSION_MINOR, [#include <gmp.h>], + AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_MINOR])) + AC_COMPUTE_INT(GhcGmpVerPl, __GNU_MP_VERSION_PATCHLEVEL, [#include <gmp.h>], + AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_PATCHLEVEL])) + AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) + +else + AC_MSG_RESULT([yes]) + UseIntreeGmp=1 + HaveSecurePowm=1 + + AC_MSG_CHECKING([GMP version]) + GhcGmpVerMj=5 + GhcGmpVerMi=0 + GhcGmpVerPl=4 + AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) fi + dnl-------------------------------------------------------------------- dnl * Make sure we got some form of gmp dnl-------------------------------------------------------------------- @@ -76,11 +102,15 @@ AC_SUBST(GMP_FRAMEWORK) AC_SUBST(HaveLibGmp) AC_SUBST(HaveFrameworkGMP) AC_SUBST(HaveSecurePowm) +AC_SUBST(UseIntreeGmp) +AC_SUBST(GhcGmpVerMj) +AC_SUBST(GhcGmpVerMi) +AC_SUBST(GhcGmpVerPl) AC_CONFIG_FILES([integer-gmp.buildinfo gmp/config.mk include/HsIntegerGmp.h]) dnl-------------------------------------------------------------------- -dnl * Generate the header cbits/GmpDerivedConstants.h +dnl * Generate output files dnl-------------------------------------------------------------------- AC_OUTPUT diff --git a/libraries/integer-gmp2/gmp/ghc-gmp.h b/libraries/integer-gmp/gmp/ghc-gmp.h index 3fdb398670..3fdb398670 100644 --- a/libraries/integer-gmp2/gmp/ghc-gmp.h +++ b/libraries/integer-gmp/gmp/ghc-gmp.h diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk index 139ae93515..78a7cf03c7 100644 --- a/libraries/integer-gmp/gmp/ghc.mk +++ b/libraries/integer-gmp/gmp/ghc.mk @@ -20,6 +20,7 @@ GMP_DIR := $(patsubst libraries/integer-gmp/gmp/tarball/%-nodoc-patched.tar.bz2, ifneq "$(NO_CLEAN_GMP)" "YES" $(eval $(call clean-target,gmp,,\ + libraries/integer-gmp/include/ghc-gmp.h \ libraries/integer-gmp/gmp/config.mk \ libraries/integer-gmp/gmp/libgmp.a \ libraries/integer-gmp/gmp/gmp.h \ @@ -49,9 +50,6 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" include libraries/integer-gmp/gmp/config.mk endif -libraries/integer-gmp_dist-install_EXTRA_CC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist -libraries/integer-gmp_dist-install_EXTRA_HC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist - gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS)) gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS)) @@ -78,27 +76,27 @@ HaveFrameworkGMP = NO endif endif -$(libraries/integer-gmp_dist-install_depfile_c_asm): $$(GmpDerivedConstants_HEADER) - +UseIntreeGmp = NO ifneq "$(HaveLibGmp)" "YES" ifneq "$(HaveFrameworkGMP)" "YES" -$(libraries/integer-gmp_dist-install_depfile_c_asm): libraries/integer-gmp/gmp/gmp.h +UseIntreeGmp = YES +endif +endif + +ifeq "$(UseIntreeGmp)" "YES" +$(libraries/integer-gmp_dist-install_depfile_c_asm): libraries/integer-gmp/gmp/gmp.h libraries/integer-gmp/include/ghc-gmp.h + +libraries/integer-gmp/include/ghc-gmp.h: libraries/integer-gmp/gmp/gmp.h + $(CP) $< $@ gmp_CC_OPTS += -Ilibraries/integer-gmp/gmp -gmp_CC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist libraries/integer-gmp_dist-install_EXTRA_OBJS += libraries/integer-gmp/gmp/objs/*.o +else +$(libraries/integer-gmp_dist-install_depfile_c_asm): libraries/integer-gmp/include/ghc-gmp.h -#INSTALL_LIBS += libraries/integer-gmp/gmp/libgmp.a -#INSTALL_HEADERS += libraries/integer-gmp/gmp/gmp.h -# -#$(eval $(call all-target,gmp_dynamic,libraries/integer-gmp/gmp/libgmp.a)) -# -#ifeq "$(BUILD_SHARED)" "yes" -#$(eval $(call all-target,gmp_dynamic,libraries/integer-gmp/gmp/libgmp.dll.a libraries/integer-gmp/gmp/libgmp-3.dll)) -#endif - -endif +libraries/integer-gmp/include/ghc-gmp.h: libraries/integer-gmp/gmp/ghc-gmp.h + $(CP) $< $@ endif libraries/integer-gmp_dist-install_EXTRA_CC_OPTS += $(gmp_CC_OPTS) @@ -111,30 +109,12 @@ else CCX = $(CC_STAGE1) endif -# 2007-09-26 -# set -o igncr -# is not a valid command on non-Cygwin-systems. -# Let it fail silently instead of aborting the build. -# -# 2007-07-05 -# We do -# set -o igncr; export SHELLOPTS -# here as otherwise checking the size of limbs -# makes the build fall over on Cygwin. See the thread -# http://www.cygwin.com/ml/cygwin/2006-12/msg00011.html -# for more details. - -# 2007-07-05 -# Passing -# as_ln_s='cp -p' -# isn't sufficient to stop cygwin using symlinks the mingw gcc can't -# follow, as it isn't used consistently. Instead we put an ln.bat in -# path that always fails. - libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h: $(RM) -rf libraries/integer-gmp/gmp/$(GMP_DIR) libraries/integer-gmp/gmp/gmpbuild libraries/integer-gmp/gmp/objs cat $(GMP_TARBALL) | $(BZIP2_CMD) -d | { cd libraries/integer-gmp/gmp && $(TAR_CMD) -xf - ; } mv libraries/integer-gmp/gmp/$(GMP_DIR) libraries/integer-gmp/gmp/gmpbuild + cd libraries/integer-gmp/gmp && $(PATCH_CMD) -p0 < gmpsrc.patch + cat libraries/integer-gmp/gmp/tarball/gmp-5.0.4.patch | { cd libraries/integer-gmp/gmp/gmpbuild && $(PATCH_CMD) -p1 ; } chmod +x libraries/integer-gmp/gmp/ln # Their cmd invocation only works on msys. On cygwin it starts @@ -156,42 +136,4 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h: cd libraries/integer-gmp/gmp/objs && $(AR_STAGE1) x ../libgmp.a $(RANLIB_CMD) libraries/integer-gmp/gmp/libgmp.a -# XXX TODO: -#stamp.gmp.shared: -# $(RM) -rf $(GMP_DIR) gmpbuild-shared -# $(TAR_CMD) -zxf $(GMP_TARBALL) -# mv $(GMP_DIR) gmpbuild-shared -# chmod +x ln -# (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \ -# PATH=`pwd`:$$PATH; \ -# export PATH; \ -# cd gmpbuild-shared && \ -# CC=$(CC_STAGE1) $(SHELL) ./configure \ -# --enable-shared=yes --disable-static \ -# --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM) -# "$(TOUCH_CMD)" $@ -# -#gmp.h: stamp.gmp.static -# $(CP) gmpbuild/gmp.h . -# -#libgmp.a: stamp.gmp.static -# -#libgmp-3.dll: stamp.gmp.shared -# $(MAKE) -C gmpbuild-shared MAKEFLAGS= -# $(CP) gmpbuild-shared/.libs/libgmp-3.dll . -# -#libgmp.dll.a: libgmp-3.dll -# $(CP) gmpbuild-shared/.libs/libgmp.dll.a . - -## GMP takes a long time to build, but changes rarely. Hence we don't -## bother cleaning it before validating, because that adds a -## significant overhead to validation. -#ifeq "$(Validating)" "NO" -#clean distclean maintainer-clean :: -# $(RM) -f stamp.gmp.static stamp.gmp.shared -# $(RM) -rf gmpbuild -# $(RM) -rf gmpbuild-shared -#endif - endif - diff --git a/libraries/integer-gmp2/gmp/gmpsrc.patch b/libraries/integer-gmp/gmp/gmpsrc.patch index e3906329ee..e3906329ee 100644 --- a/libraries/integer-gmp2/gmp/gmpsrc.patch +++ b/libraries/integer-gmp/gmp/gmpsrc.patch diff --git a/libraries/integer-gmp/include/HsIntegerGmp.h.in b/libraries/integer-gmp/include/HsIntegerGmp.h.in index 11c64677e8..ba0767cae7 100644 --- a/libraries/integer-gmp/include/HsIntegerGmp.h.in +++ b/libraries/integer-gmp/include/HsIntegerGmp.h.in @@ -1,6 +1,14 @@ #ifndef _HS_INTEGER_GMP_H_ #define _HS_INTEGER_GMP_H_ -#define HAVE_SECURE_POWM @HaveSecurePowm@ +/* Whether GMP is embedded into integer-gmp */ +#define GHC_GMP_INTREE @UseIntreeGmp@ + +/* The following values denote the GMP version used during GHC build-time */ +#define GHC_GMP_VERSION_MJ @GhcGmpVerMj@ +#define GHC_GMP_VERSION_MI @GhcGmpVerMi@ +#define GHC_GMP_VERSION_PL @GhcGmpVerPl@ +#define GHC_GMP_VERSION \ + (@GhcGmpVerMj@ * 10000 + @GhcGmpVerMi@ * 100 + @GhcGmpVerPl@) #endif /* _HS_INTEGER_GMP_H_ */ diff --git a/libraries/integer-gmp/integer-gmp.buildinfo.in b/libraries/integer-gmp/integer-gmp.buildinfo.in index 9b2bad99d7..805a425a19 100644 --- a/libraries/integer-gmp/integer-gmp.buildinfo.in +++ b/libraries/integer-gmp/integer-gmp.buildinfo.in @@ -2,4 +2,4 @@ include-dirs: @GMP_INCLUDE_DIRS@ extra-lib-dirs: @GMP_LIB_DIRS@ extra-libraries: @GMP_LIBS@ frameworks: @GMP_FRAMEWORK@ -install-includes: HsIntegerGmp.h
\ No newline at end of file +install-includes: HsIntegerGmp.h ghc-gmp.h diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal index 493da28e80..4833704481 100644 --- a/libraries/integer-gmp/integer-gmp.cabal +++ b/libraries/integer-gmp/integer-gmp.cabal @@ -1,41 +1,26 @@ -name: integer-gmp -version: 0.5.1.0 --- GHC 7.6.1 released with 0.5.0.0 -license: BSD3 -license-file: LICENSE -category: Numerical -maintainer: libraries@haskell.org -bug-reports: http://ghc.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29&keywords=integer-gmp -synopsis: Integer library based on GMP -description: - This package provides the low-level implementation of the standard - 'Integer' type based on the - <http://gmplib.org/ GNU Multiple Precision Arithmetic Library (GMP)>. - . - This package provides access to the internal representation of - 'Integer' as well as primitive operations with no proper error - handling, and should only be used directly with the utmost care. - . - For more details about the design of @integer-gmp@, see - <https://ghc.haskell.org/trac/ghc/wiki/Commentary/Libraries/Integer GHC Commentary: Libraries/Integer>. -build-type: Configure -cabal-version: >=1.10 +name: integer-gmp +version: 1.0.0.0 +synopsis: Integer library based on GMP +license: BSD3 +license-file: LICENSE +author: Herbert Valerio Riedel +maintainer: hvr@gnu.org +category: Numeric, Algebra +build-type: Configure +cabal-version: >=1.10 extra-source-files: aclocal.m4 - cbits/alloc.c - cbits/float.c - cbits/gmp-wrappers.cmm - cbits/longlong.c + cbits/wrappers.c changelog.md config.guess config.sub configure configure.ac gmp/config.mk.in + include/HsIntegerGmp.h.in install-sh integer-gmp.buildinfo.in - include/HsIntegerGmp.h.in extra-tmp-files: autom4te.cache @@ -45,36 +30,37 @@ extra-tmp-files: integer-gmp.buildinfo include/HsIntegerGmp.h -source-repository head - type: git - location: http://git.haskell.org/ghc.git - subdir: libraries/integer-gmp - -Library - default-language: Haskell2010 - other-extensions: - BangPatterns - CPP - GHCForeignImportPrim - MagicHash - NoImplicitPrelude - UnboxedTuples - UnliftedFFITypes +library + default-language: Haskell2010 + other-extensions: + BangPatterns + CApiFFI + CPP + DeriveDataTypeable + ExplicitForAll + GHCForeignImportPrim + MagicHash + NegativeLiterals + NoImplicitPrelude + RebindableSyntax + StandaloneDeriving + UnboxedTuples + UnliftedFFITypes + build-depends: ghc-prim + hs-source-dirs: src/ + ghc-options: -this-package-key integer-gmp -Wall + cc-options: -std=c99 -Wall - exposed-modules: - GHC.Integer - GHC.Integer.GMP.Internals - GHC.Integer.GMP.Prim - GHC.Integer.Logarithms - GHC.Integer.Logarithms.Internals - other-modules: - GHC.Integer.Type + include-dirs: include + c-sources: + cbits/wrappers.c - c-sources: cbits/cbits.c - include-dirs: include + exposed-modules: + GHC.Integer + GHC.Integer.Logarithms + GHC.Integer.Logarithms.Internals - build-depends: ghc-prim == 0.4.* + GHC.Integer.GMP.Internals - -- We need to set the package key to integer-gmp - -- (without a version number) as it's magic. - ghc-options: -Wall -this-package-key integer-gmp + other-modules: + GHC.Integer.Type diff --git a/libraries/integer-gmp/mkGmpDerivedConstants/Makefile b/libraries/integer-gmp/mkGmpDerivedConstants/Makefile deleted file mode 100644 index ce66e201b4..0000000000 --- a/libraries/integer-gmp/mkGmpDerivedConstants/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# ----------------------------------------------------------------------------- -# -# (c) 2009 The University of Glasgow -# -# This file is part of the GHC build system. -# -# To understand how the build system works and how to modify it, see -# http://ghc.haskell.org/trac/ghc/wiki/Building/Architecture -# http://ghc.haskell.org/trac/ghc/wiki/Building/Modifying -# -# ----------------------------------------------------------------------------- - -dir = libraries/integer-gmp/mkGmpDerivedConstants -TOP = ../../.. -include $(TOP)/mk/sub-makefile.mk diff --git a/libraries/integer-gmp/mkGmpDerivedConstants/ghc.mk b/libraries/integer-gmp/mkGmpDerivedConstants/ghc.mk deleted file mode 100644 index fcf19fa4a0..0000000000 --- a/libraries/integer-gmp/mkGmpDerivedConstants/ghc.mk +++ /dev/null @@ -1,39 +0,0 @@ -# ----------------------------------------------------------------------------- -# -# (c) 2009 The University of Glasgow -# -# This file is part of the GHC build system. -# -# To understand how the build system works and how to modify it, see -# http://ghc.haskell.org/trac/ghc/wiki/Building/Architecture -# http://ghc.haskell.org/trac/ghc/wiki/Building/Modifying -# -# ----------------------------------------------------------------------------- - -libraries/integer-gmp/mkGmpDerivedConstants_dist_C_SRCS = mkGmpDerivedConstants.c -libraries/integer-gmp/mkGmpDerivedConstants_dist_PROGNAME = mkGmpDerivedConstants -libraries/integer-gmp/mkGmpDerivedConstants_dist_TOPDIR = YES -libraries/integer-gmp/mkGmpDerivedConstants_dist_INSTALL = YES -libraries/integer-gmp/mkGmpDerivedConstants_dist_INSTALL_INPLACE = YES -libraries/integer-gmp/mkGmpDerivedConstants_dist_EXTRA_CC_OPTS += $(gmp_CC_OPTS) - -$(eval $(call build-prog,libraries/integer-gmp/mkGmpDerivedConstants,dist,1)) - -GmpDerivedConstants_HEADER = libraries/integer-gmp/mkGmpDerivedConstants/dist/GmpDerivedConstants.h - -$(GmpDerivedConstants_HEADER): $(mkGmpDerivedConstants_INPLACE) - $< > $@ - -ifneq "$(HaveLibGmp)" "YES" -ifneq "$(HaveFrameworkGMP)" "YES" -# NOTE: we should really be referring to the depfile generated by the build -# system here, but due to an awkward contortion I can't figure out, the build -# system follows an implied from somewhere else to directly build the C file -# instead (independent of the depfile rules), which doesn't have a built gmp.h -# dependency. This race causes the parallel build to fail. -# -# See #8102 -libraries/integer-gmp/mkGmpDerivedConstants/mkGmpDerivedConstants.c: libraries/integer-gmp/gmp/gmp.h -endif -endif - diff --git a/libraries/integer-gmp/mkGmpDerivedConstants/mkGmpDerivedConstants.c b/libraries/integer-gmp/mkGmpDerivedConstants/mkGmpDerivedConstants.c deleted file mode 100644 index fb7290f682..0000000000 --- a/libraries/integer-gmp/mkGmpDerivedConstants/mkGmpDerivedConstants.c +++ /dev/null @@ -1,75 +0,0 @@ -/* -------------------------------------------------------------------------- - * - * (c) The GHC Team, 1992-2004 - * - * mkDerivedConstants.c - * - * Basically this is a C program that extracts information from the C - * declarations in the header files (primarily struct field offsets) - * and generates a header file that can be #included into non-C source - * containing this information. - * - * ------------------------------------------------------------------------*/ - -#include <stdio.h> -#include "gmp.h" - - -#define str(a,b) #a "_" #b - -#define OFFSET(s_type, field) ((size_t)&(((s_type*)0)->field)) - -/* struct_size(TYPE) - * - */ -#define def_size(str, size) \ - printf("#define SIZEOF_" str " %lu\n", (unsigned long)size); - -#define struct_size(s_type) \ - def_size(#s_type, sizeof(s_type)); - - - -/* struct_field(TYPE, FIELD) - * - */ -#define def_offset(str, offset) \ - printf("#define OFFSET_" str " %d\n", (int)(offset)); - -#define field_offset_(str, s_type, field) \ - def_offset(str, OFFSET(s_type,field)); - -#define field_offset(s_type, field) \ - field_offset_(str(s_type,field),s_type,field); - -#define field_type_(str, s_type, field) \ - printf("#define REP_" str " b"); \ - printf("%lu\n", (unsigned long)sizeof (__typeof__(((((s_type*)0)->field)))) * 8); - -#define field_type(s_type, field) \ - field_type_(str(s_type,field),s_type,field); - -/* An access macro for use in C-- sources. */ -#define struct_field_macro(str) \ - printf("#define " str "(__ptr__) REP_" str "[__ptr__+OFFSET_" str "]\n"); - -/* Outputs the byte offset and MachRep for a field */ -#define struct_field(s_type, field) \ - field_offset(s_type, field); \ - field_type(s_type, field); \ - struct_field_macro(str(s_type,field)) - - -int -main(int argc, char *argv[]) -{ - printf("/* This file is created automatically. Do not edit by hand.*/\n\n"); - - struct_size(MP_INT); - struct_field(MP_INT,_mp_alloc); - struct_field(MP_INT,_mp_size); - struct_field(MP_INT,_mp_d); - def_size("MP_LIMB_T", sizeof(mp_limb_t)); - - return 0; -} diff --git a/libraries/integer-gmp2/src/GHC/Integer.hs b/libraries/integer-gmp/src/GHC/Integer.hs index ffd708bb93..ffd708bb93 100644 --- a/libraries/integer-gmp2/src/GHC/Integer.hs +++ b/libraries/integer-gmp/src/GHC/Integer.hs diff --git a/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs b/libraries/integer-gmp/src/GHC/Integer/GMP/Internals.hs index 0ad6848974..0ad6848974 100644 --- a/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs +++ b/libraries/integer-gmp/src/GHC/Integer/GMP/Internals.hs diff --git a/libraries/integer-gmp2/src/GHC/Integer/Logarithms.hs b/libraries/integer-gmp/src/GHC/Integer/Logarithms.hs index cbcc860002..cbcc860002 100644 --- a/libraries/integer-gmp2/src/GHC/Integer/Logarithms.hs +++ b/libraries/integer-gmp/src/GHC/Integer/Logarithms.hs diff --git a/libraries/integer-gmp2/src/GHC/Integer/Logarithms/Internals.hs b/libraries/integer-gmp/src/GHC/Integer/Logarithms/Internals.hs index 7ac3645c74..7ac3645c74 100644 --- a/libraries/integer-gmp2/src/GHC/Integer/Logarithms/Internals.hs +++ b/libraries/integer-gmp/src/GHC/Integer/Logarithms/Internals.hs diff --git a/libraries/integer-gmp2/src/GHC/Integer/Type.hs b/libraries/integer-gmp/src/GHC/Integer/Type.hs index 5670bb459f..5670bb459f 100644 --- a/libraries/integer-gmp2/src/GHC/Integer/Type.hs +++ b/libraries/integer-gmp/src/GHC/Integer/Type.hs diff --git a/libraries/integer-gmp2/.gitignore b/libraries/integer-gmp2/.gitignore deleted file mode 100644 index 3f3fc66144..0000000000 --- a/libraries/integer-gmp2/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -/GNUmakefile -/autom4te.cache/ -/config.log -/config.status -/configure -/dist-install/ -/ghc.mk -/gmp/config.mk -/include/HsIntegerGmp.h -/integer-gmp.buildinfo - -/gmp/gmp.h -/gmp/gmpbuild -/include/ghc-gmp.h diff --git a/libraries/integer-gmp2/LICENSE b/libraries/integer-gmp2/LICENSE deleted file mode 100644 index 0ce51e0bd0..0000000000 --- a/libraries/integer-gmp2/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -Copyright (c) 2014, Herbert Valerio Riedel - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of Herbert Valerio Riedel nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libraries/integer-gmp2/Setup.hs b/libraries/integer-gmp2/Setup.hs deleted file mode 100644 index 54f57d6f11..0000000000 --- a/libraries/integer-gmp2/Setup.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Main (main) where - -import Distribution.Simple - -main :: IO () -main = defaultMainWithHooks autoconfUserHooks diff --git a/libraries/integer-gmp2/aclocal.m4 b/libraries/integer-gmp2/aclocal.m4 deleted file mode 100644 index be248615f5..0000000000 --- a/libraries/integer-gmp2/aclocal.m4 +++ /dev/null @@ -1,44 +0,0 @@ - -dnl-------------------------------------------------------------------- -dnl * Check whether this machine has gmp/gmp3 installed -dnl-------------------------------------------------------------------- - -AC_DEFUN([LOOK_FOR_GMP_LIB],[ - if test "$HaveFrameworkGMP" = "NO" - then - AC_CHECK_LIB([gmp], [__gmpz_powm], - [HaveLibGmp=YES; GMP_LIBS=gmp]) - if test "$HaveLibGmp" = "NO" - then - AC_CHECK_LIB([gmp3], [__gmpz_powm], - [HaveLibGmp=YES; GMP_LIBS=gmp3]) - fi - if test "$HaveLibGmp" = "YES" - then - AC_CHECK_LIB([$GMP_LIBS], [__gmpz_powm_sec], - [HaveSecurePowm=1]) - fi - fi -]) - -dnl-------------------------------------------------------------------- -dnl * Mac OS X only: check for GMP.framework -dnl-------------------------------------------------------------------- - -AC_DEFUN([LOOK_FOR_GMP_FRAMEWORK],[ - if test "$HaveLibGmp" = "NO" - then - case $target_os in - darwin*) - AC_MSG_CHECKING([for GMP.framework]) - save_libs="$LIBS" - LIBS="-framework GMP" - AC_TRY_LINK_FUNC(__gmpz_powm_sec, - [HaveFrameworkGMP=YES; GMP_FRAMEWORK=GMP]) - LIBS="$save_libs" - AC_MSG_RESULT([$HaveFrameworkGMP]) - ;; - esac - fi -]) - diff --git a/libraries/integer-gmp2/changelog.md b/libraries/integer-gmp2/changelog.md deleted file mode 100644 index cb55b80e95..0000000000 --- a/libraries/integer-gmp2/changelog.md +++ /dev/null @@ -1,51 +0,0 @@ -# Changelog for [`integer-gmp` package](http://hackage.haskell.org/package/integer-gmp) - -## 1.0.0.0 *Mar 2015* - - * Bundled with GHC 7.10.1 - - * Complete rewrite of `integer-gmp`. For more details, see - https://ghc.haskell.org/trac/ghc/wiki/Design/IntegerGmp2 - -## 0.5.1.0 *Feb 2014* - - * Bundled with GHC 7.8.1 - - * Improved Haddock documentation - - * New [PrimBool](https://ghc.haskell.org/trac/ghc/wiki/PrimBool) - versions of comparison predicates in `GHC.Integer`: - - eqInteger# :: Integer -> Integer -> Int# - geInteger# :: Integer -> Integer -> Int# - gtInteger# :: Integer -> Integer -> Int# - leInteger# :: Integer -> Integer -> Int# - ltInteger# :: Integer -> Integer -> Int# - neqInteger# :: Integer -> Integer -> Int# - - * New `GHC.Integer.testBitInteger` primitive for use with `Data.Bits` - - * Reduce short-lived heap allocation and try to demote `J#` back - to `S#` more aggressively. See also - [#8647](https://ghc.haskell.org/trac/ghc/ticket/8647) - for more details. - - * New GMP-specific binary (de)serialization primitives added to - `GHC.Integer.GMP.Internals`: - - importIntegerFromByteArray - importIntegerFromAddr - exportIntegerToAddr - exportIntegerToMutableByteArray - sizeInBaseInteger - - * New GMP-implemented number-theoretic operations added to - `GHC.Integer.GMP.Internals`: - - gcdExtInteger - nextPrimeInteger - testPrimeInteger - powInteger - powModInteger - powModSecInteger - recipModInteger diff --git a/libraries/integer-gmp2/config.guess b/libraries/integer-gmp2/config.guess deleted file mode 100755 index 1f5c50c0d1..0000000000 --- a/libraries/integer-gmp2/config.guess +++ /dev/null @@ -1,1420 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. - -timestamp='2014-03-23' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include <features.h> - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include <stdio.h> /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <sys/systemcfg.h> - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <unistd.h> - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} - exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL - elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 - fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -cat >&2 <<EOF -$0: unable to guess system type - -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from - - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/libraries/integer-gmp2/config.sub b/libraries/integer-gmp2/config.sub deleted file mode 100755 index d654d03cdc..0000000000 --- a/libraries/integer-gmp2/config.sub +++ /dev/null @@ -1,1794 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. - -timestamp='2014-05-01' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2014 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/libraries/integer-gmp2/configure.ac b/libraries/integer-gmp2/configure.ac deleted file mode 100644 index 0bd91887b8..0000000000 --- a/libraries/integer-gmp2/configure.ac +++ /dev/null @@ -1,116 +0,0 @@ -AC_INIT([Haskell integer (GMP)], [1.0], [libraries@haskell.org], [integer]) -AC_PREREQ(2.52) - -# Safety check: Ensure that we are in the correct source directory. -AC_CONFIG_SRCDIR([cbits/wrappers.c]) - -AC_CANONICAL_TARGET - -AC_ARG_WITH([cc], - [C compiler], - [CC=$withval]) -AC_PROG_CC() - - -dnl-------------------------------------------------------------------- -dnl * Deal with arguments telling us gmp is somewhere odd -dnl-------------------------------------------------------------------- - -AC_ARG_WITH([gmp-includes], - [AC_HELP_STRING([--with-gmp-includes], - [directory containing gmp.h])], - [GMP_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval"], - [GMP_INCLUDE_DIRS=]) - -AC_ARG_WITH([gmp-libraries], - [AC_HELP_STRING([--with-gmp-libraries], - [directory containing gmp library])], - [GMP_LIB_DIRS=$withval; LDFLAGS="-L$withval"], - [GMP_LIB_DIRS=]) - -AC_ARG_WITH([gmp-framework-preferred], - [AC_HELP_STRING([--with-gmp-framework-preferred], - [on OSX, prefer the GMP framework to the gmp lib])], - [GMP_PREFER_FRAMEWORK=YES], - [GMP_PREFER_FRAMEWORK=NO]) - -AC_ARG_WITH([intree-gmp], - [AC_HELP_STRING([--with-intree-gmp], - [force using the in-tree GMP])], - [GMP_FORCE_INTREE=YES], - [GMP_FORCE_INTREE=NO]) - -dnl-------------------------------------------------------------------- -dnl * Detect gmp -dnl-------------------------------------------------------------------- - -HaveLibGmp=NO -GMP_LIBS= -HaveFrameworkGMP=NO -GMP_FRAMEWORK= -HaveSecurePowm=0 - -if test "$GMP_FORCE_INTREE" != "YES" -then - if test "$GMP_PREFER_FRAMEWORK" = "YES" - then - LOOK_FOR_GMP_FRAMEWORK - LOOK_FOR_GMP_LIB - else - LOOK_FOR_GMP_LIB - LOOK_FOR_GMP_FRAMEWORK - fi -fi - -AC_MSG_CHECKING([whether to use in-tree GMP]) -if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES" -then - AC_MSG_RESULT([no]) - UseIntreeGmp=0 - AC_CHECK_HEADER([gmp.h], , [AC_MSG_ERROR([Cannot find gmp.h])]) - - AC_MSG_CHECKING([GMP version]) - AC_COMPUTE_INT(GhcGmpVerMj, __GNU_MP_VERSION, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION])) - AC_COMPUTE_INT(GhcGmpVerMi, __GNU_MP_VERSION_MINOR, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_MINOR])) - AC_COMPUTE_INT(GhcGmpVerPl, __GNU_MP_VERSION_PATCHLEVEL, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_PATCHLEVEL])) - AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) - -else - AC_MSG_RESULT([yes]) - UseIntreeGmp=1 - HaveSecurePowm=1 - - AC_MSG_CHECKING([GMP version]) - GhcGmpVerMj=5 - GhcGmpVerMi=0 - GhcGmpVerPl=4 - AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) -fi - - -dnl-------------------------------------------------------------------- -dnl * Make sure we got some form of gmp -dnl-------------------------------------------------------------------- - -AC_SUBST(GMP_INCLUDE_DIRS) -AC_SUBST(GMP_LIBS) -AC_SUBST(GMP_LIB_DIRS) -AC_SUBST(GMP_FRAMEWORK) -AC_SUBST(HaveLibGmp) -AC_SUBST(HaveFrameworkGMP) -AC_SUBST(HaveSecurePowm) -AC_SUBST(UseIntreeGmp) -AC_SUBST(GhcGmpVerMj) -AC_SUBST(GhcGmpVerMi) -AC_SUBST(GhcGmpVerPl) - -AC_CONFIG_FILES([integer-gmp.buildinfo gmp/config.mk include/HsIntegerGmp.h]) - -dnl-------------------------------------------------------------------- -dnl * Generate output files -dnl-------------------------------------------------------------------- - -AC_OUTPUT diff --git a/libraries/integer-gmp2/gmp/config.mk.in b/libraries/integer-gmp2/gmp/config.mk.in deleted file mode 100644 index 93a4f5369b..0000000000 --- a/libraries/integer-gmp2/gmp/config.mk.in +++ /dev/null @@ -1,11 +0,0 @@ -ifeq "$(HaveLibGmp)" "" - HaveLibGmp = @HaveLibGmp@ -endif - -ifeq "$(HaveFrameworkGMP)" "" - HaveFrameworkGMP = @HaveFrameworkGMP@ -endif - -GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@ -GMP_LIB_DIRS = @GMP_LIB_DIRS@ - diff --git a/libraries/integer-gmp2/gmp/ghc.mk b/libraries/integer-gmp2/gmp/ghc.mk deleted file mode 100644 index 2d8aaccb0f..0000000000 --- a/libraries/integer-gmp2/gmp/ghc.mk +++ /dev/null @@ -1,139 +0,0 @@ -# ----------------------------------------------------------------------------- -# -# (c) 2009 The University of Glasgow -# -# This file is part of the GHC build system. -# -# To understand how the build system works and how to modify it, see -# http://ghc.haskell.org/trac/ghc/wiki/Building/Architecture -# http://ghc.haskell.org/trac/ghc/wiki/Building/Modifying -# -# ----------------------------------------------------------------------------- - -# We use a tarball like gmp-4.2.4-nodoc.tar.bz2, which is -# gmp-4.2.4.tar.bz2 repacked without the doc/ directory contents. -# That's because the doc/ directory contents are under the GFDL, -# which causes problems for Debian. - -GMP_TARBALL := $(wildcard libraries/integer-gmp/gmp/tarball/gmp*.tar.bz2) -GMP_DIR := $(patsubst libraries/integer-gmp/gmp/tarball/%-nodoc-patched.tar.bz2,%,$(GMP_TARBALL)) - -ifneq "$(NO_CLEAN_GMP)" "YES" -$(eval $(call clean-target,gmp,,\ - libraries/integer-gmp2/include/ghc-gmp.h \ - libraries/integer-gmp2/gmp/config.mk \ - libraries/integer-gmp2/gmp/libgmp.a \ - libraries/integer-gmp2/gmp/gmp.h \ - libraries/integer-gmp2/gmp/gmpbuild \ - libraries/integer-gmp2/gmp/$(GMP_DIR))) - -clean : clean_gmp -.PHONY: clean_gmp -clean_gmp: - $(call removeTrees,libraries/integer-gmp2/gmp/objs) - $(call removeTrees,libraries/integer-gmp2/gmp/gmpbuild) -endif - -ifeq "$(Windows_Host)" "YES" -# Apparently building on Windows fails when there is a system gmp -# available, so we never try to use the system gmp on Windows -libraries/integer-gmp2_CONFIGURE_OPTS += --configure-option=--with-intree-gmp -endif - -ifeq "$(GMP_PREFER_FRAMEWORK)" "YES" -libraries/integer-gmp2_CONFIGURE_OPTS += --with-gmp-framework-preferred -endif - -ifeq "$(phase)" "final" - -ifeq "$(findstring clean,$(MAKECMDGOALS))" "" -include libraries/integer-gmp2/gmp/config.mk -endif - -gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS)) -gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS)) - -# Compile GMP only if we don't have it already -# -# We use GMP's own configuration stuff, because it's all rather hairy -# and not worth re-implementing in our Makefile framework. - -ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn" -BUILD_SHARED=yes -else -BUILD_SHARED=no -endif - -# In a bindist, we don't want to know whether /this/ machine has gmp, -# but whether the machine the bindist was built on had gmp. -ifeq "$(BINDIST)" "YES" -ifeq "$(wildcard libraries/integer-gmp2/gmp/libgmp.a)" "" -HaveLibGmp = YES -HaveFrameworkGMP = YES -else -HaveLibGmp = NO -HaveFrameworkGMP = NO -endif -endif - -UseIntreeGmp = NO -ifneq "$(HaveLibGmp)" "YES" -ifneq "$(HaveFrameworkGMP)" "YES" -UseIntreeGmp = YES -endif -endif - -ifeq "$(UseIntreeGmp)" "YES" -$(libraries/integer-gmp2_dist-install_depfile_c_asm): libraries/integer-gmp2/gmp/gmp.h libraries/integer-gmp2/include/ghc-gmp.h - -libraries/integer-gmp2/include/ghc-gmp.h: libraries/integer-gmp2/gmp/gmp.h - $(CP) $< $@ - -gmp_CC_OPTS += -Ilibraries/integer-gmp2/gmp - -libraries/integer-gmp2_dist-install_EXTRA_OBJS += libraries/integer-gmp2/gmp/objs/*.o -else -$(libraries/integer-gmp2_dist-install_depfile_c_asm): libraries/integer-gmp2/include/ghc-gmp.h - -libraries/integer-gmp2/include/ghc-gmp.h: libraries/integer-gmp2/gmp/ghc-gmp.h - $(CP) $< $@ -endif - -libraries/integer-gmp2_dist-install_EXTRA_CC_OPTS += $(gmp_CC_OPTS) - -CLANG = $(findstring clang, $(shell $(CC_STAGE1) --version)) - -ifeq "$(CLANG)" "clang" -CCX = $(CLANG) -else -CCX = $(CC_STAGE1) -endif - -libraries/integer-gmp2/gmp/libgmp.a libraries/integer-gmp2/gmp/gmp.h: - $(RM) -rf libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild libraries/integer-gmp2/gmp/objs - cat $(GMP_TARBALL) | $(BZIP2_CMD) -d | { cd libraries/integer-gmp2/gmp && $(TAR_CMD) -xf - ; } - mv libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild - cd libraries/integer-gmp2/gmp && $(PATCH_CMD) -p0 < gmpsrc.patch - cat libraries/integer-gmp/gmp/tarball/gmp-5.0.4.patch | { cd libraries/integer-gmp2/gmp/gmpbuild && $(PATCH_CMD) -p1 ; } - chmod +x libraries/integer-gmp2/gmp/ln - - # Their cmd invocation only works on msys. On cygwin it starts - # a cmd interactive shell. The replacement works in both environments. - mv libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh.orig - sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh.orig > libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh - - cd libraries/integer-gmp2/gmp; (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \ - PATH=`pwd`:$$PATH; \ - export PATH; \ - cd gmpbuild && \ - CC=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \ - --enable-shared=no \ - --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM) - $(MAKE) -C libraries/integer-gmp2/gmp/gmpbuild MAKEFLAGS= - $(CP) libraries/integer-gmp2/gmp/gmpbuild/gmp.h libraries/integer-gmp2/gmp/ - $(CP) libraries/integer-gmp2/gmp/gmpbuild/.libs/libgmp.a libraries/integer-gmp2/gmp/ - $(MKDIRHIER) libraries/integer-gmp2/gmp/objs - cd libraries/integer-gmp2/gmp/objs && $(AR_STAGE1) x ../libgmp.a - $(RANLIB_CMD) libraries/integer-gmp2/gmp/libgmp.a - -endif diff --git a/libraries/integer-gmp2/gmp/ln b/libraries/integer-gmp2/gmp/ln deleted file mode 100755 index a3a297ccdb..0000000000 --- a/libraries/integer-gmp2/gmp/ln +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exit 1 - diff --git a/libraries/integer-gmp2/include/HsIntegerGmp.h.in b/libraries/integer-gmp2/include/HsIntegerGmp.h.in deleted file mode 100644 index ba0767cae7..0000000000 --- a/libraries/integer-gmp2/include/HsIntegerGmp.h.in +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _HS_INTEGER_GMP_H_ -#define _HS_INTEGER_GMP_H_ - -/* Whether GMP is embedded into integer-gmp */ -#define GHC_GMP_INTREE @UseIntreeGmp@ - -/* The following values denote the GMP version used during GHC build-time */ -#define GHC_GMP_VERSION_MJ @GhcGmpVerMj@ -#define GHC_GMP_VERSION_MI @GhcGmpVerMi@ -#define GHC_GMP_VERSION_PL @GhcGmpVerPl@ -#define GHC_GMP_VERSION \ - (@GhcGmpVerMj@ * 10000 + @GhcGmpVerMi@ * 100 + @GhcGmpVerPl@) - -#endif /* _HS_INTEGER_GMP_H_ */ diff --git a/libraries/integer-gmp2/install-sh b/libraries/integer-gmp2/install-sh deleted file mode 100755 index 377bb8687f..0000000000 --- a/libraries/integer-gmp2/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/libraries/integer-gmp2/integer-gmp.buildinfo.in b/libraries/integer-gmp2/integer-gmp.buildinfo.in deleted file mode 100644 index 805a425a19..0000000000 --- a/libraries/integer-gmp2/integer-gmp.buildinfo.in +++ /dev/null @@ -1,5 +0,0 @@ -include-dirs: @GMP_INCLUDE_DIRS@ -extra-lib-dirs: @GMP_LIB_DIRS@ -extra-libraries: @GMP_LIBS@ -frameworks: @GMP_FRAMEWORK@ -install-includes: HsIntegerGmp.h ghc-gmp.h diff --git a/libraries/integer-gmp2/integer-gmp.cabal b/libraries/integer-gmp2/integer-gmp.cabal deleted file mode 100644 index 4833704481..0000000000 --- a/libraries/integer-gmp2/integer-gmp.cabal +++ /dev/null @@ -1,66 +0,0 @@ -name: integer-gmp -version: 1.0.0.0 -synopsis: Integer library based on GMP -license: BSD3 -license-file: LICENSE -author: Herbert Valerio Riedel -maintainer: hvr@gnu.org -category: Numeric, Algebra -build-type: Configure -cabal-version: >=1.10 - -extra-source-files: - aclocal.m4 - cbits/wrappers.c - changelog.md - config.guess - config.sub - configure - configure.ac - gmp/config.mk.in - include/HsIntegerGmp.h.in - install-sh - integer-gmp.buildinfo.in - -extra-tmp-files: - autom4te.cache - config.log - config.status - gmp/config.mk - integer-gmp.buildinfo - include/HsIntegerGmp.h - -library - default-language: Haskell2010 - other-extensions: - BangPatterns - CApiFFI - CPP - DeriveDataTypeable - ExplicitForAll - GHCForeignImportPrim - MagicHash - NegativeLiterals - NoImplicitPrelude - RebindableSyntax - StandaloneDeriving - UnboxedTuples - UnliftedFFITypes - build-depends: ghc-prim - hs-source-dirs: src/ - ghc-options: -this-package-key integer-gmp -Wall - cc-options: -std=c99 -Wall - - include-dirs: include - c-sources: - cbits/wrappers.c - - exposed-modules: - GHC.Integer - GHC.Integer.Logarithms - GHC.Integer.Logarithms.Internals - - GHC.Integer.GMP.Internals - - other-modules: - GHC.Integer.Type diff --git a/mk/config.mk.in b/mk/config.mk.in index b32f227f08..f4cb52baf1 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -230,7 +230,7 @@ ExtraMakefileSanityChecks = NO # Options for Libraries # Which directory (in libraries/) contains the integer library? -INTEGER_LIBRARY=integer-gmp2 +INTEGER_LIBRARY=integer-gmp # We build the libraries at least the "vanilla" way (way "v") GhcLibWays = v diff --git a/rules/foreachLibrary.mk b/rules/foreachLibrary.mk index 254321e3b0..cdd54962db 100644 --- a/rules/foreachLibrary.mk +++ b/rules/foreachLibrary.mk @@ -31,7 +31,6 @@ # - bin-package-db # - ghc-prim # - integer-gmp -# - integer-gmp2 # - integer-simple # - template-haskell @@ -42,7 +41,6 @@ $$(foreach hashline,libraries/bin-package-db#-#no-remote-repo#no-vcs \ libraries/base#-#no-remote-repo#no-vcs \ libraries/ghc-prim#-#no-remote-repo#no-vcs \ libraries/integer-gmp#-#no-remote-repo#no-vcs \ - libraries/integer-gmp2#-#no-remote-repo#no-vcs \ libraries/integer-simple#-#no-remote-repo#no-vcs \ libraries/template-haskell#-#no-remote-repo#no-vcs \ $$(shell grep '^libraries/' packages | sed 's/ */#/g'),\ diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 47968a1b77..f0662519d8 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -419,15 +419,11 @@ generate directory distdir dll0Modules config_args transitiveDepNames = map (display . packageName) transitive_dep_ids libraryDirs = forDeps Installed.libraryDirs - -- temporary hack to support two in-tree versions of `integer-gmp` - isIntegerGmp2 = any ("integer-gmp2" `isInfixOf`) libraryDirs -- The mkLibraryRelDir function is a bit of a hack. -- Ideally it should be handled in the makefiles instead. mkLibraryRelDir "rts" = "rts/dist/build" mkLibraryRelDir "ghc" = "compiler/stage2/build" mkLibraryRelDir "Cabal" = "libraries/Cabal/Cabal/dist-install/build" - mkLibraryRelDir "integer-gmp" - | isIntegerGmp2 = mkLibraryRelDir "integer-gmp2" mkLibraryRelDir l = "libraries/" ++ l ++ "/dist-install/build" libraryRelDirs = map mkLibraryRelDir transitiveDepNames wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs |