projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the arity and strictness agree, for wired-in bottoming Ids
[ghc-hetmet.git]
/
includes
/
Stg.h
diff --git
a/includes/Stg.h
b/includes/Stg.h
index
5cd3701
..
6ddf17a
100644
(file)
--- a/
includes/Stg.h
+++ b/
includes/Stg.h
@@
-41,6
+41,11
@@
#include "ghcconfig.h"
#include "RtsConfig.h"
#include "ghcconfig.h"
#include "RtsConfig.h"
+/* The code generator calls the math functions directly in .hc code.
+ NB. after configuration stuff above, because this sets #defines
+ that depend on config info, such as __USE_FILE_OFFSET64 */
+#include <math.h>
+
/* -----------------------------------------------------------------------------
Useful definitions
-------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Useful definitions
-------------------------------------------------------------------------- */
@@
-66,7
+71,9
@@
#define BITS_IN(x) (BITS_PER_BYTE * sizeof(x))
/*
#define BITS_IN(x) (BITS_PER_BYTE * sizeof(x))
/*
- * 'Portable' inlining
+ * 'Portable' inlining:
+ * INLINE_HEADER is for inline functions in header files
+ * STATIC_INLINE is for inline functions in source files
*/
#if defined(__GNUC__) || defined( __INTEL_COMPILER)
# define INLINE_HEADER static inline
*/
#if defined(__GNUC__) || defined( __INTEL_COMPILER)
# define INLINE_HEADER static inline
@@
-146,7
+153,6
@@
typedef StgWord StgWordArray[];
#include "StgDLL.h"
#include "MachRegs.h"
#include "Regs.h"
#include "StgDLL.h"
#include "MachRegs.h"
#include "Regs.h"
-#include "StgProf.h" /* ToDo: separate out RTS-only stuff from here */
#if IN_STG_CODE
/*
#if IN_STG_CODE
/*
@@
-156,8
+162,7
@@
typedef StgWord StgWordArray[];
#include "StgMiscClosures.h"
#endif
#include "StgMiscClosures.h"
#endif
-/* RTS external interface */
-#include "RtsExternal.h"
+#include "SMP.h" // write_barrier() inline is required
/* -----------------------------------------------------------------------------
Moving Floats and Doubles
/* -----------------------------------------------------------------------------
Moving Floats and Doubles