diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile-templ | 15 | ||||
| -rw-r--r-- | config/Makefile.mingw | 3 | ||||
| -rw-r--r-- | config/Makefile.msvc | 3 | ||||
| -rwxr-xr-x | config/auto-aux/hasgot | 3 | ||||
| -rw-r--r-- | config/s-templ.h | 4 |
5 files changed, 16 insertions, 12 deletions
diff --git a/config/Makefile-templ b/config/Makefile-templ index d442a8c3e4..73180db018 100644 --- a/config/Makefile-templ +++ b/config/Makefile-templ @@ -261,12 +261,17 @@ OTHERLIBRARIES=unix str num threads graph dynlink labltk bigarray ### Name of the target architecture for the "num" library # Known targets: -# x86 68K vax ns mips alpha pyramid i960 -# sparc supersparc sparc-solaris supersparc-solaris -# See the file otherlibs/num/README for more explanations. -# If you don't know, leave BIGNUM_ARCH=C, which selects a portable +# generic (portable C, works everywhere) +# ia32 (Intel x86) +# amd64 (AMD Opteron, Athlon64) +# alpha +# mips +# ppc (Power PC) +# sparc +# If you don't know, leave BNG_ARCH=generic, which selects a portable # C implementation of these routines. -BIGNUM_ARCH=alpha +BNG_ARCH=generic +BNG_ASM_LEVEL=1 ### Link-time options to ocamlc or ocamlopt for linking with POSIX threads # Needed for the "systhreads" package diff --git a/config/Makefile.mingw b/config/Makefile.mingw index b7b02a15f5..5f6a6767cf 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -108,7 +108,8 @@ BINUTILS_OBJCOPY=objcopy OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray labltk ### Name of the target architecture for the "num" library -BIGNUM_ARCH=C +BNG_ARCH=ia32 +BNG_ASM_LEVEL=1 ### Configuration for LablTk # Set TK_ROOT to the directory where you installed TCL/TK 8.3 diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 7144f9e01e..cf353a6692 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -108,7 +108,8 @@ BINUTILS_OBJCOPY=objcopy OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray labltk ### Name of the target architecture for the "num" library -BIGNUM_ARCH=C +BNG_ARCH=generic +BNG_ASM_LEVEL=0 ### Configuration for LablTk # Set TK_ROOT to the directory where you installed TCL/TK 8.3 diff --git a/config/auto-aux/hasgot b/config/auto-aux/hasgot index 99384768a9..5014b903d7 100755 --- a/config/auto-aux/hasgot +++ b/config/auto-aux/hasgot @@ -4,10 +4,11 @@ opts="" libs="$cclibs" args=$* rm -f hasgot.c +var="x" while : ; do case "$1" in -i) echo "#include <$2>" >> hasgot.c; shift;; - -t) echo "$2 the_$2;" >> hasgot.c; shift;; + -t) echo "$2 $var;" >> hasgot.c; var="x$var"; shift;; -l*|-L*|-F*) libs="$libs $1";; -framework) libs="$libs $1 $2"; shift;; -*) opts="$opts $1";; diff --git a/config/s-templ.h b/config/s-templ.h index 8411ce41c9..bbbffb4fa3 100644 --- a/config/s-templ.h +++ b/config/s-templ.h @@ -47,10 +47,6 @@ Also add the required libraries (e.g. -lcurses -ltermcap) to $(CCLIBS) in ../Makefile.config */ -#define HAS_STRERROR - -/* Define HAS_STRERROR if you have strerror(). */ - #define SUPPORT_DYNAMIC_LINKING /* Define SUPPORT_DYNAMIC_LINKING if dynamic loading of C stub code |