3 files changed, 14 insertions, 7 deletions
diff --git a/config/Makefile-templ b/config/Makefile-templ
index d442a8c3e..73180db01 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 b7b02a15f..5f6a6767c 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 7144f9e01..cf353a669 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