merge of '3d9e9476c5b2a2ee125eee7e0dd10bfe460d0546'

     and '9fe0310805932b889bdfa17c9213f2b97d47ab6a'

31 files changed, 18 insertions, 482 deletions

diff --git a/misc/botan.rc b/misc/botan.rc
deleted file mode 100644
index aaa1b3f91..000000000
--- a/misc/botan.rc
+++ /dev/null
@@ -1,225 +0,0 @@
-# Botan configuration (v1.4.2)
-
-# This config, as shipped, matches the library defaults, but is much easier to
-# tweak than recompiling everything. You can use it as a base for your own
-# configurations. Read section 10.4 "Configuration Files" in the API doc for
-# more information.
-
-[base]
-memory_chunk = 32*1024  # size of the chunk of memory allocated at once
-default_pbe = PBE-PKCS5v20(SHA-1,TripleDES/CBC)
-pkcs8_tries = 3
-
-[pk]
-blinder_size = 64
-test/public = basic
-test/private = basic
-test/private_gen = all
-
-[pem]
-search = 4*1024
-forgive = 8
-width = 64
-
-[rng]
-# LibraryInitializer will try to acquire at least this many bits of entropy
-min_entropy = 384
-es_files = /dev/urandom:/dev/random        # path for random devices
-egd_path = /var/run/egd-pool:/dev/egd-pool # path to search for an EGD socket
-ms_capi_prov_type = INTEL_SEC:RSA_FULL     # prefered MS CryptoAPI providers
-unix_path = /usr/ucb:/usr/etc:/etc
-
-[x509]
-validity_slack = 24h    # how much wiggle room is given when checking validity
-v1_assume_ca = false       # should v1/v2 certificates be considered CA certs?
-cache_verify_results = 30m # how long to cache verification results
-
-[x509/ca]
-allow_ca = false   # should PKCS #10 requests be able to ask to be a CA?
-  # should basic_constraints be included in all certs, including end-user?
-basic_constraints = always
-default_expire = 1y       # default expire time for new certs
-signing_offset = 30s      # offset the PKCS #10 validity times by this amount
-rsa_hash = SHA-1          # what hash to use when using RSA to sign new certs
-str_type = latin1         # default string encoding (latin1 or utf8)
-
-[x509/crl]
-# can be 'ignore' or 'throw': ignore matches X.509-2000 behavior, throw is PKIX
-unknown_critical = ignore
-
-# When generating a new CRL, this is the default next update time. Can also be
-# set in the call to X509_CA::update_crl/X509_CA::new_crl as the last arg
-next_update = 7d
-
-[x509/exts]
-# Each of these can be one of:
-#  - critical: Extension is marked as critical, if we have the info for it
-#  - yes or noncritical: Extension is included if needed, but not critical
-#  - no: Extension is not included, even if the information is available
-basic_constraints = critical
-subject_key_id = yes
-authority_key_id = yes
-subject_alternative_name = yes
-issuer_alternative_name = yes
-key_usage = critical
-extended_key_usage = yes
-crl_number = yes
-
-[aliases]
-Rijndael = AES
-3DES = TripleDES
-DES-EDE = TripleDES
-CAST5 = CAST-128
-3-Way = ThreeWay
-SHARK = SHARK-E
-SEAL = SEAL-3.0-BE
-SHA1 = SHA-160
-SHA-1 = SHA-160 # Don't change or remove this
-MARK-4 = ARC4(256)
-
-OpenPGP.Cipher.1 = IDEA
-OpenPGP.Cipher.2 = TripleDES
-OpenPGP.Cipher.3 = CAST-128
-OpenPGP.Cipher.4 = Blowfish
-OpenPGP.Cipher.5 = SAFER-SK(13)
-OpenPGP.Cipher.7 = AES-128
-OpenPGP.Cipher.8 = AES-192
-OpenPGP.Cipher.9 = AES-256
-OpenPGP.Cipher.10 = Twofish
-
-OpenPGP.Digest.1 = MD5
-OpenPGP.Digest.2 = SHA-1
-OpenPGP.Digest.3 = RIPEMD-160
-OpenPGP.Digest.5 = MD2
-OpenPGP.Digest.6 = Tiger(24,3)
-OpenPGP.Digest.7 = HAVAL(20,5)
-OpenPGP.Digest.8 = SHA-256
-
-TLS.Digest.0 = Parallel(MD5,SHA-1)
-
-EME-PKCS1-v1_5 = PKCS1v15
-OAEP-MGF1 = EME1
-EME-OAEP = EME1
-X9.31 = EMSA2
-EMSA-PKCS1-v1_5 = EMSA3
-PSS-MGF1 = EMSA4
-EMSA-PSS = EMSA4
-
-[oids]
-ISO_MEMBER = 1.2
-US_BODY = ISO_MEMBER.840
-X500 = 2.5
-
-RSA_DSI = US_BODY.113549
-ANSI_X957 = US_BODY.10040
-ANSI_X942 = US_BODY.10046
-NIST_ALGO = 2.16.840.1.101.3.4
-PKIX_USAGE = 1.3.6.1.5.5.7.3
-GNU_PROJECT = 1.3.6.1.4.1.11591
-OIW_ALGO = 1.3.14.3.2
-DN_ATTR = X500.4
-X509_KU = X500.29
-
-PKCS    = RSA_DSI.1
-PKCS1   = PKCS.1
-PKCS5   = PKCS.5
-PKCS7   = PKCS.7
-PKCS9   = PKCS.9
-
-DES/CBC = OIW_ALGO.7
-TripleDES/CBC = RSA_DSI.3.7
-RC2/CBC = RSA_DSI.3.2
-CAST-128/CBC = US_BODY.113533.7.66.10
-AES-128/CBC = NIST_ALGO.1.2
-AES-192/CBC = NIST_ALGO.1.22
-AES-256/CBC = NIST_ALGO.1.42
-
-MD5 = RSA_DSI.2.5
-SHA-160 = OIW_ALGO.26
-Tiger(24,3) = GNU_PROJECT.12.2
-
-KeyWrap.TripleDES = PKCS9.16.3.6
-KeyWrap.RC2 = PKCS9.16.3.7
-KeyWrap.CAST-128 = US_BODY.113533.7.66.15
-KeyWrap.AES-128 = NIST_ALGO.1.5
-KeyWrap.AES-192 = NIST_ALGO.1.25
-KeyWrap.AES-256 = NIST_ALGO.1.45
-
-Compression.Zlib = PKCS9.16.3.8
-
-RSA = PKCS1.1
-RSA = X500.8.1.1
-DSA = ANSI_X957.4.1
-DH = ANSI_X942.2.1
-
-DSA/EMSA1(SHA-160)/DER = ANSI_X957.4.3
-DSA/EMSA1(SHA-160) = ANSI_X957.4.3
-RSA/EMSA3(MD2) = PKCS1.2
-RSA/EMSA3(MD5) = PKCS1.4
-RSA/EMSA3(SHA-160) = PKCS1.5
-RSA/EMSA3(SHA-256) = PKCS1.11
-RSA/EMSA3(SHA-384) = PKCS1.12
-RSA/EMSA3(SHA-512) = PKCS1.13
-RSA/EMSA3(RIPEMD-160) = 1.3.36.3.3.1.2
-
-PBE-PKCS5v15(MD2,DES/CBC) = PKCS5.1
-PBE-PKCS5v15(MD2,RC2/CBC) = PKCS5.4
-PBE-PKCS5v15(MD5,DES/CBC) = PKCS5.3
-PBE-PKCS5v15(MD5,RC2/CBC) = PKCS5.6
-PBE-PKCS5v15(SHA-160,DES/CBC) = PKCS5.10
-PBE-PKCS5v15(SHA-160,RC2/CBC) = PKCS5.11
-PBE-PKCS5v20 = PKCS5.13
-PKCS5.PBKDF2 = PKCS5.12
-
-CMS.DataContent = PKCS7.1
-CMS.SignedData = PKCS7.2
-CMS.EnvelopedData = PKCS7.3
-CMS.DigestedData = PKCS7.5
-CMS.EncryptedData = PKCS7.6
-CMS.AuthenticatedData = PKCS9.16.1.2
-CMS.CompressedData = PKCS9.16.1.9
-
-PKCS9.EmailAddress = PKCS9.1
-PKCS9.UnstructuredName = PKCS9.2
-PKCS9.ContentType = PKCS9.3
-PKCS9.MessageDigest = PKCS9.4
-PKCS9.ChallengePassword = PKCS9.7
-PKCS9.ExtensionRequest = PKCS9.14
-
-X520.CommonName = DN_ATTR.3
-X520.Surname = DN_ATTR.4
-X520.SerialNumber = DN_ATTR.5
-X520.Country = DN_ATTR.6
-X520.Locality = DN_ATTR.7
-X520.State = DN_ATTR.8
-X520.Organization = DN_ATTR.10
-X520.OrganizationalUnit = DN_ATTR.11
-X520.Title = DN_ATTR.12
-X520.GivenName = DN_ATTR.42
-X520.Initials = DN_ATTR.43
-X520.GenerationalQualifier = DN_ATTR.44
-X520.DNQualifier = DN_ATTR.46
-X520.Pseudonym = DN_ATTR.65
-
-X509v3.SubjectKeyIdentifier = X509_KU.14
-X509v3.KeyUsage = X509_KU.15
-X509v3.SubjectAlternativeName = X509_KU.17
-X509v3.IssuerAlternativeName = X509_KU.18
-X509v3.BasicConstraints = X509_KU.19
-X509v3.CRLNumber = X509_KU.20
-X509v3.ReasonCode = X509_KU.21
-X509v3.HoldInstructionCode = X509_KU.23
-X509v3.InvalidityDate = X509_KU.24
-X509v3.CertificatePolicies = X509_KU.32
-X509v3.AuthorityKeyIdentifier = X509_KU.35
-X509v3.PolicyConstraints = X509_KU.36
-X509v3.ExtendedKeyUsage = X509_KU.37
-
-PKIX.ServerAuth = PKIX_USAGE.1
-PKIX.ClientAuth = PKIX_USAGE.2
-PKIX.CodeSigning = PKIX_USAGE.3
-PKIX.EmailProtection = PKIX_USAGE.4
-PKIX.IPsecEndSystem = PKIX_USAGE.5
-PKIX.IPsecTunnel = PKIX_USAGE.6
-PKIX.IPsecUser = PKIX_USAGE.7
-PKIX.TimeStamping = PKIX_USAGE.8
diff --git a/misc/config/arch/alpha b/misc/config/arch/alpha
index 51c5e7220..16159207f 100644
--- a/misc/config/arch/alpha
+++ b/misc/config/arch/alpha
@@ -1,6 +1,7 @@
 realname "DEC Alpha"
 
 default_submodel alpha-ev5
+endian little
 
 <aliases>
 axp
diff --git a/misc/config/arch/amd64 b/misc/config/arch/amd64
index 2291ef055..403ac47ec 100644
--- a/misc/config/arch/amd64
+++ b/misc/config/arch/amd64
@@ -3,6 +3,7 @@ realname "AMD64"
 default_submodel amd64
 
 endian little
+unaligned ok
 
 <aliases>
 x86-64
diff --git a/misc/config/arch/ia32 b/misc/config/arch/ia32
index 1eec8cdbe..1d2b36af1 100644
--- a/misc/config/arch/ia32
+++ b/misc/config/arch/ia32
@@ -1,8 +1,9 @@
 realname "IA-32"
 
-default_submodel i586
+default_submodel i686
 
 endian little
+unaligned ok
 
 <aliases>
 x86
diff --git a/misc/config/arch/ppc b/misc/config/arch/ppc
index 01cd92ad0..0f7ceac2b 100644
--- a/misc/config/arch/ppc
+++ b/misc/config/arch/ppc
@@ -1,5 +1,7 @@
 realname "PowerPC"
 
+endian big
+
 # G3; probably a reasonable assumption these days
 default_submodel ppc740
 
diff --git a/misc/config/arch/ppc64 b/misc/config/arch/ppc64
index cbd74bb9f..2bb789949 100644
--- a/misc/config/arch/ppc64
+++ b/misc/config/arch/ppc64
@@ -1,5 +1,7 @@
 realname "PowerPC 64"
 
+endian big
+
 default_submodel power4
 
 <submodel_aliases>
diff --git a/misc/config/cc/bcc b/misc/config/cc/bcc
index 56206fb81..a3bf7cf6f 100644
--- a/misc/config/cc/bcc
+++ b/misc/config/cc/bcc
@@ -26,11 +26,3 @@ i686     -> "/G6"
 athlon   -> "/G6"
 pentium4 -> "/G6"
 </mach_opt>
-
-<arch>
-ia32
-</arch>
-
-<os>
-windows
-</os>
diff --git a/misc/config/cc/compaq b/misc/config/cc/compaq
index 5710698a0..90811b039 100644
--- a/misc/config/cc/compaq
+++ b/misc/config/cc/compaq
@@ -24,12 +24,3 @@ default -> "$(CXX) -shared -soname $(SONAME)"
 <mach_opt>
 alpha -> "-arch=SUBMODEL" alpha-
 </mach_opt>
-
-<arch>
-alpha
-</arch>
-
-<os>
-tru64
-linux
-</os>
diff --git a/misc/config/cc/ekopath b/misc/config/cc/ekopath
index abf0b5b1c..f8bd8f2fe 100644
--- a/misc/config/cc/ekopath
+++ b/misc/config/cc/ekopath
@@ -35,12 +35,3 @@ core2duo -> "-mcpu=core"
 ia32     -> "-mcpu=anyx86"
 amd64    -> "-mcpu=athlon64"
 </mach_opt>
-
-<os>
-linux
-</os>
-
-<arch>
-ia32
-amd64
-</arch>
diff --git a/misc/config/cc/gcc b/misc/config/cc/gcc
index 1485037c2..2111f9940 100644
--- a/misc/config/cc/gcc
+++ b/misc/config/cc/gcc
@@ -81,39 +81,3 @@ freebsd -> "-pthread"
 netbsd  -> "-pthread"
 qnx     -> "-fexceptions -D_QNX_SOURCE"
 </mach_abi_linking>
-
-<os>
-aix
-beos
-cygwin
-darwin
-freebsd
-hpux
-irix
-linux
-netbsd
-openbsd
-qnx
-solaris
-tru64
-windows
-</os>
-
-<arch>
-alpha
-amd64
-arm
-hppa
-ia32
-ia64
-m68k
-mips32
-mips64
-ppc
-ppc64
-s390
-s390x
-sh
-sparc32
-sparc64
-</arch>
diff --git a/misc/config/cc/hpcc b/misc/config/cc/hpcc
index 7167be329..2048c5bb2 100644
--- a/misc/config/cc/hpcc
+++ b/misc/config/cc/hpcc
@@ -27,11 +27,3 @@ hppa2.0 -> "+DA2.0W"
 <so_link_flags>
 default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?)
 </so_link_flags>
-
-<arch>
-hppa
-</arch>
-
-<os>
-hpux
-</os>
diff --git a/misc/config/cc/icc b/misc/config/cc/icc
index ad9957e1d..4d51b5fe9 100644
--- a/misc/config/cc/icc
+++ b/misc/config/cc/icc
@@ -1,6 +1,6 @@
 realname "Intel C++"
 
-binary_name "icc"
+binary_name "icpc"
 
 compile_option "-c "
 output_to_option "-o "
@@ -11,30 +11,20 @@ add_lib_option "-l"
 lib_opt_flags "-O3 -ip -unroll"
 check_opt_flags "-O2"
 debug_flags "-g"
-no_debug_flags ""
+no_debug_flags "-fomit-frame-pointer"
 lang_flags ""
 warning_flags "-w1"
-so_obj_flags "-KPIC"
+so_obj_flags "-fPIC"
 
 makefile_style unix
 
 <mach_opt>
-i586     -> "-tpp5"
-i686     -> "-tpp6 -xiM"
-athlon   -> "-tpp6 -xiM"
-pentium4 -> "-tpp7 -xiMW"
+i686     -> "-march=pentium3"
+athlon   -> "-march=pentium3"
+pentium4 -> "-march=pentium4"
+core2duo -> "-msse3"
 </mach_opt>
 
 <so_link_flags>
-default -> "$(CXX) -KPIC -shared"
+default -> "$(CXX) -fPIC -shared"
 </so_link_flags>
-
-<arch>
-amd64
-ia32
-ia64
-</arch>
-
-<os>
-linux
-</os>
diff --git a/misc/config/cc/kai b/misc/config/cc/kai
index 49afd1a3b..564ca2157 100644
--- a/misc/config/cc/kai
+++ b/misc/config/cc/kai
@@ -25,22 +25,3 @@ default -> "$(CXX) --soname $(SONAME)"
 <mach_abi_linking>
 all -> "--one_per"
 </mach_abi_linking>
-
-<arch>
-alpha
-hppa
-ia32
-mips32
-mips64
-sparc32
-sparc64
-</arch>
-
-<os>
-hpux
-irix
-linux
-solaris
-tru64
-</os>
-
diff --git a/misc/config/cc/mipspro b/misc/config/cc/mipspro
index 2f01cf29e..8ceeb52b7 100644
--- a/misc/config/cc/mipspro
+++ b/misc/config/cc/mipspro
@@ -37,12 +37,3 @@ mips64-r10000 -> "-mips4 -r10000"
 mips32 -> "-n32"
 mips64 -> "-64"
 </mach_abi_linking>
-
-<arch>
-mips32
-mips64
-</arch>
-
-<os>
-irix
-</os>
diff --git a/misc/config/cc/msvc b/misc/config/cc/msvc
index cb5b56b5d..5bcec8e23 100644
--- a/misc/config/cc/msvc
+++ b/misc/config/cc/msvc
@@ -10,7 +10,7 @@ add_lib_option ""
 
 lib_opt_flags "/O2 /Ob2"
 check_opt_flags "/O2"
-debug_flags ""
+debug_flags "/Zi"
 no_debug_flags ""
 lang_flags "/EHsc /GR /D_CONSOLE"
 warning_flags ""
@@ -18,11 +18,3 @@ warning_flags ""
 ar_command "link /lib"
 
 makefile_style nmake
-
-<arch>
-ia32
-</arch>
-
-<os>
-windows
-</os>
diff --git a/misc/config/cc/pgi b/misc/config/cc/pgi
index 9b5a24611..b67edbcc3 100644
--- a/misc/config/cc/pgi
+++ b/misc/config/cc/pgi
@@ -26,12 +26,3 @@ athlon   -> "-tp k7"
 pentium4 -> "-tp p6"
 ia32     -> "-tp px"
 </mach_opt>
-
-<arch>
-ia32
-</arch>
-
-<os>
-linux
-solaris
-</os>
diff --git a/misc/config/cc/sgipro64 b/misc/config/cc/sgipro64
index b1429df94..5bb561834 100644
--- a/misc/config/cc/sgipro64
+++ b/misc/config/cc/sgipro64
@@ -25,11 +25,3 @@ default -> "$(CXX) -shared -Wl,-soname,$(SONAME)"
 <mach_opt>
 
 </mach_opt>
-
-<arch>
-ia64
-</arch>
-
-<os>
-linux
-</os>
diff --git a/misc/config/cc/sunwspro b/misc/config/cc/sunwspro
index 179b06408..842df153f 100644
--- a/misc/config/cc/sunwspro
+++ b/misc/config/cc/sunwspro
@@ -41,13 +41,3 @@ sparc64    -> "-xchip=SUBMODEL" sparc64-
 <mach_abi_linking>
 sparc64    -> "-xarch=v9"
 </mach_abi_linking>
-
-<arch>
-ia32
-sparc32
-sparc64
-</arch>
-
-<os>
-solaris
-</os>
diff --git a/misc/config/os/aix b/misc/config/os/aix
index fd7330f18..cec818580 100644
--- a/misc/config/os/aix
+++ b/misc/config/os/aix
@@ -5,9 +5,3 @@ os_type unix
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-ia64
-ppc
-ppc64
-</arch>
diff --git a/misc/config/os/beos b/misc/config/os/beos
index 498bd493d..2b12792bb 100644
--- a/misc/config/os/beos
+++ b/misc/config/os/beos
@@ -11,11 +11,6 @@ doc_dir documentation
 all
 </supports_shared>
 
-<arch>
-ia32
-ppc
-</arch>
-
 <aliases>
 haiku
 </aliases>
diff --git a/misc/config/os/cygwin b/misc/config/os/cygwin
index ce10e504b..c2aadea98 100644
--- a/misc/config/os/cygwin
+++ b/misc/config/os/cygwin
@@ -11,9 +11,3 @@ doc_dir docs
 <supports_shared>
 #all
 </supports_shared>
-
-<arch>
-ia32
-amd64 # in theory
-ia64  # in theory
-</arch>
diff --git a/misc/config/os/freebsd b/misc/config/os/freebsd
index d7818cdc6..6cc184d98 100644
--- a/misc/config/os/freebsd
+++ b/misc/config/os/freebsd
@@ -7,12 +7,3 @@ install_group wheel
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-alpha
-amd64
-ia32
-ia64
-powerpc
-sparc64
-</arch>
diff --git a/misc/config/os/hpux b/misc/config/os/hpux
index 7a12d10dd..6e17d3b73 100644
--- a/misc/config/os/hpux
+++ b/misc/config/os/hpux
@@ -8,11 +8,6 @@ so_suffix sl
 all
 </supports_shared>
 
-<arch>
-hppa
-ia64
-</arch>
-
 <aliases>
 hp-ux
 </aliases>
diff --git a/misc/config/os/irix b/misc/config/os/irix
index 773942391..fd8b43287 100644
--- a/misc/config/os/irix
+++ b/misc/config/os/irix
@@ -5,9 +5,3 @@ os_type unix
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-mips32
-mips64
-</arch>
-
diff --git a/misc/config/os/linux b/misc/config/os/linux
index 701fc9091..acf224244 100644
--- a/misc/config/os/linux
+++ b/misc/config/os/linux
@@ -6,22 +6,3 @@ os_type unix
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-alpha
-amd64
-arm
-hppa
-ia32
-ia64
-m68k
-mips32
-mips64
-ppc
-ppc64
-sh
-sparc32
-sparc64
-s390
-s390x
-</arch>
diff --git a/misc/config/os/netbsd b/misc/config/os/netbsd
index b0caeff70..da713e3a0 100644
--- a/misc/config/os/netbsd
+++ b/misc/config/os/netbsd
@@ -7,17 +7,3 @@ install_group wheel
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-alpha
-amd64
-arm
-hppa
-ia32
-ia64
-m68k
-mips32
-mips64
-ppc
-sparc32
-</arch>
diff --git a/misc/config/os/openbsd b/misc/config/os/openbsd
index 8d0329e1e..9f966bf49 100644
--- a/misc/config/os/openbsd
+++ b/misc/config/os/openbsd
@@ -7,13 +7,3 @@ install_group wheel
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-alpha
-ia32
-m68k
-mips32
-ppc
-sparc32
-sparc64
-</arch>
diff --git a/misc/config/os/qnx b/misc/config/os/qnx
index cd5ddab5f..28bc8dea9 100644
--- a/misc/config/os/qnx
+++ b/misc/config/os/qnx
@@ -5,11 +5,3 @@ os_type unix
 <supports_shared>
 all
 </supports_shared>
-
-<arch>
-arm
-ia32
-mips32
-ppc
-sh
-</arch>
diff --git a/misc/config/os/solaris b/misc/config/os/solaris
index 078019584..58b458e9b 100644
--- a/misc/config/os/solaris
+++ b/misc/config/os/solaris
@@ -9,12 +9,6 @@ install_cmd_exec install -u OWNER -g GROUP -m 755
 all
 </supports_shared>
 
-<arch>
-ia32
-sparc32
-sparc64
-</arch>
-
 <aliases>
 sunos
 </aliases>
diff --git a/misc/config/os/tru64 b/misc/config/os/tru64
index e2b264104..e320c1df4 100644
--- a/misc/config/os/tru64
+++ b/misc/config/os/tru64
@@ -6,10 +6,6 @@ os_type unix
 all
 </supports_shared>
 
-<arch>
-alpha
-</arch>
-
 <aliases>
 osf1
 </aliases>
diff --git a/misc/config/os/windows b/misc/config/os/windows
index 44b2a102b..2f21da309 100644
--- a/misc/config/os/windows
+++ b/misc/config/os/windows
@@ -19,12 +19,7 @@ install_group <nil>
 #all
 </supports_shared>
 
-<arch>
-ia32
-amd64 # in theory
-ia64  # in theory
-</arch>
-
 <aliases>
 win32
+mswin32
 </aliases>