summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMark Shinwell <mshinwell@gmail.com>2016-07-29 15:07:10 +0100
committerGitHub <noreply@github.com>2016-07-29 15:07:10 +0100
commitcd0bd8aa73398d826a9da26ac4d21e5322cb1d0b (patch)
treefd16b63f71970640fb4d5355237d10af24c39314 /config
parentd7700c10415df1532eb89eef536d3653e614d854 (diff)
downloadocaml-cd0bd8aa73398d826a9da26ac4d21e5322cb1d0b.tar.gz
Spacetime: a new memory profiler (#585)
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.mingw4
-rw-r--r--config/Makefile.mingw644
-rw-r--r--config/Makefile.msvc4
-rw-r--r--config/Makefile.msvc644
-rwxr-xr-xconfig/auto-aux/hasgot1
-rw-r--r--config/m-nt.h2
6 files changed, 19 insertions, 0 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index 3f321e2d9e..d261afb6e3 100644
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -86,6 +86,10 @@ ASM_CFI_SUPPORTED=false
UNIXLIB=win32unix
GRAPHLIB=win32graph
FLAMBDA=false
+WITH_SPACETIME=false
+LIBUNWIND_AVAILABLE=false
+LIBUNWIND_LINK_FLAGS=
+PROFINFO_WIDTH=26
SAFE_STRING=false
########## Configuration for the bytecode compiler
diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64
index 3ec8b432e3..f6fddb937f 100644
--- a/config/Makefile.mingw64
+++ b/config/Makefile.mingw64
@@ -86,6 +86,10 @@ ASM_CFI_SUPPORTED=false
UNIXLIB=win32unix
GRAPHLIB=win32graph
FLAMBDA=false
+WITH_SPACETIME=false
+LIBUNWIND_AVAILABLE=false
+LIBUNWIND_LINK_FLAGS=
+PROFINFO_WIDTH=26
SAFE_STRING=false
########## Configuration for the bytecode compiler
diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index bc84ff721b..0a657bfd06 100644
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -80,6 +80,10 @@ ASM_CFI_SUPPORTED=false
UNIXLIB=win32unix
GRAPHLIB=win32graph
FLAMBDA=false
+WITH_SPACETIME=false
+LIBUNWIND_AVAILABLE=false
+LIBUNWIND_LINK_FLAGS=
+PROFINFO_WIDTH=26
SAFE_STRING=false
########## Configuration for the bytecode compiler
diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64
index bc965b3287..dbc21d5d40 100644
--- a/config/Makefile.msvc64
+++ b/config/Makefile.msvc64
@@ -79,6 +79,10 @@ ASM_CFI_SUPPORTED=false
UNIXLIB=win32unix
GRAPHLIB=win32graph
FLAMBDA=false
+WITH_SPACETIME=false
+LIBUNWIND_AVAILABLE=false
+LIBUNWIND_LINK_FLAGS=
+PROFINFO_WIDTH=26
SAFE_STRING=false
########## Configuration for the bytecode compiler
diff --git a/config/auto-aux/hasgot b/config/auto-aux/hasgot
index 1ba464ca9b..8b6c690396 100755
--- a/config/auto-aux/hasgot
+++ b/config/auto-aux/hasgot
@@ -24,6 +24,7 @@ while : ; do
case "$1" in
-i) echo "#include <$2>" >> hasgot.c; shift;;
-t) echo "$2 $var;" >> hasgot.c; var="x$var"; shift;;
+ -Xl) libs="$libs $2"; shift;;
-l*|-L*|-F*) libs="$libs $1";;
-framework) libs="$libs $1 $2"; shift;;
-*) opts="$opts $1";;
diff --git a/config/m-nt.h b/config/m-nt.h
index 900e3f09f7..28a1815ab7 100644
--- a/config/m-nt.h
+++ b/config/m-nt.h
@@ -47,3 +47,5 @@
#endif
#undef NONSTANDARD_DIV_MOD
+
+#define PROFINFO_WIDTH 26