9 files changed, 50 insertions, 42 deletions
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index 93306dde1..f2ea46ef2 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -15,7 +15,6 @@ lang_flags ""
 warning_flags ""
 
 shared_flags ""
-dll_import_flags ""
 
 ar_command lib
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 14c51349c..f4db26ee8 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -17,11 +17,12 @@ makefile_style unix
 
 lib_opt_flags "-O2"
 check_opt_flags "-O2"
-shared_flags "-fPIC -fvisibility=hidden"
+shared_flags "-fPIC"
 debug_flags -g
 no_debug_flags "-finline-functions"
 
-dll_import_flags '__attribute__((visibility("default")))'
+visibility_build_flags "-fvisibility=hidden"
+visibility_attribute '__attribute__((visibility("default")))'
 
 <so_link_flags>
 # The default works for GNU ld and several other Unix linkers
@@ -29,12 +30,12 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 </so_link_flags>
 
 <mach_opt>
-amd64     -> "-march=SUBMODEL"
+x86_64    -> "-march=SUBMODEL"
 nehalem   -> "-march=core2 -mssse3 -msse4.1"
 </mach_opt>
 
 <mach_abi_linking>
-amd64   -> "-m64"
+x86_64  -> "-m64"
 mips64  -> "-mabi=64"
 s390    -> "-m31"
 s390x   -> "-m64"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index ac514261e..c6e8b6550 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -28,10 +28,9 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 athlon   -> "-mcpu=athlon"
 pentium4 -> "-mcpu=pentium4"
 
-opteron  -> "-mcpu=opteron"
-em64t    -> "-mcpu=em64t"
+k8       -> "-mcpu=opteron"
 core2    -> "-mcpu=core"
 
-ia32     -> "-mcpu=anyx86"
-amd64    -> "-mcpu=athlon64"
+x86_32   -> "-mcpu=anyx86"
+x86_64   -> "-mcpu=athlon64"
 </mach_opt>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 2f71c7a18..84e923764 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,6 +1,6 @@
 macro_name GCC
 
-binary_name g++-4.5.2
+binary_name g++-4.6.0
 
 compile_option "-c "
 output_to_option "-o "
@@ -11,15 +11,16 @@ add_lib_option -l
 lang_flags "-D_REENTRANT -std=c++0x"
 warning_flags "-W -Wall"
 
-maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual"
+maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast"
 
 lib_opt_flags "-O3"
 check_opt_flags "-O2"
-shared_flags "-fPIC -fvisibility=hidden"
+shared_flags "-fPIC"
 debug_flags -g
 no_debug_flags "-finline-functions"
 
-dll_import_flags '__attribute__((visibility("default")))'
+visibility_build_flags "-fvisibility=hidden"
+visibility_attribute '__attribute__((visibility("default")))'
 
 makefile_style unix
 
@@ -33,53 +34,57 @@ aix     -> "$(CXX) -shared -fPIC"
 darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
 hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
 solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
-# Gotta use ld directly on BeOS, their GCC is busted
-beos    -> "ld -shared -h $(SONAME)"
 </so_link_flags>
 
 <mach_opt>
-# Specializations first (they don't need to be, just clearer)
-i386           -> "-mtune=i686 -momit-leaf-frame-pointer"
-ppc601         -> "-mpowerpc -mcpu=601"
+ppc601      -> "-mpowerpc -mcpu=601"
+cellppu     -> "-mcpu=cell"
+e500v2      -> "-mcpu=8548"
+atom32      -> "-march=atom -momit-leaf-frame-pointer"
+
+alpha-ev68  -> "-mcpu=ev67"
+alpha-ev7   -> "-mcpu=ev67"
+
+# The patch from Debian bug 594159 has this, don't know why though...
+sh4         -> "-m4 -mieee"
+
+# This is mostly for Debian's benefit
+i486        -> "-mtune=generic -momit-leaf-frame-pointer"
 
 # Until GCC gets -march support for these models
-nehalem        -> "-march=core2 -msse4.1 -msse4.2"
-westmere       -> "-march=core2 -maes -msse4.1 -msse4.2"
-atom           -> "-march=i686 -msse2 -mssse3"
-cellppu        -> ""
-alpha-ev68     -> "-mcpu=ev6"
-alpha-ev7      -> "-mcpu=ev6"
+nehalem     -> "-march=core2 -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
+westmere    -> "-march=core2 -maes -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
 
 # Default family options (SUBMODEL is substitued with the real submodel)
 # Anything after the quotes is what should be *removed* from the submodel name
 # before it's put into SUBMODEL.
 alpha     -> "-mcpu=SUBMODEL" alpha-
-amd64     -> "-march=SUBMODEL -momit-leaf-frame-pointer"
-arm       -> "-mcpu=SUBMODEL"
-ia32      -> "-march=SUBMODEL -momit-leaf-frame-pointer"
-ia64      -> "-mtune=SUBMODEL"
+arm       -> "-march=SUBMODEL"
+superh    -> "-mSUBMODEL" sh
 hppa      -> "-march=SUBMODEL" hppa
+ia64      -> "-mtune=SUBMODEL"
 m68k      -> "-mSUBMODEL"
-hitachi-sh -> "-mSUBMODEL" hitachi-sh
-sparc32   -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32-
-sparc64   -> "-mcpu=v9 -mtune=SUBMODEL"
 mips32    -> "-mips1 -mcpu=SUBMODEL" mips32-
 mips64    -> "-mips3 -mcpu=SUBMODEL" mips64-
-ppc       -> "-mcpu=SUBMODEL" ppc
+ppc32     -> "-mcpu=SUBMODEL" ppc
 ppc64     -> "-mcpu=SUBMODEL" ppc
+sparc32   -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32-
+sparc64   -> "-mcpu=v9 -mtune=SUBMODEL"
+x86_32    -> "-march=SUBMODEL -momit-leaf-frame-pointer"
+x86_64    -> "-march=SUBMODEL -momit-leaf-frame-pointer"
 </mach_opt>
 
-# Note that the 'linking' bit means "use this for both compiling *and* linking"
+# The 'linking' bit means "use this for both compiling *and* linking"
 <mach_abi_linking>
 all     -> "-pthread"
 
-amd64   -> "-m64"
 mips64  -> "-mabi=64"
 s390    -> "-m31"
 s390x   -> "-m64"
 sparc32 -> "-m32 -mno-app-regs"
 sparc64 -> "-m64 -mno-app-regs"
 ppc64   -> "-m64"
+x86_64  -> "-m64"
 
 netbsd  -> "-D_NETBSD_SOURCE"
 qnx     -> "-fexceptions -D_QNX_SOURCE"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index 1aab4d111..e11875cb1 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -30,5 +30,5 @@ westmere  -> "-march=core2"
 </mach_opt>
 
 <so_link_flags>
-default -> "$(CXX) -fPIC -shared"
+default -> "$(CXX) -fPIC -shared -Wl,-soname,$(SONAME)"
 </so_link_flags>
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index a854a576d..034ea7444 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -14,8 +14,8 @@ check_opt_flags "/O2 /D_CONSOLE"
 lang_flags "/EHs /GR"
 warning_flags "/W3 /wd4275 /wd4267"
 
-shared_flags "/DBOTAN_DLL=__declspec(dllexport)"
-dll_import_flags "__declspec(dllimport)"
+visibility_build_flags "/DBOTAN_DLL=__declspec(dllexport)"
+visibility_attribute "__declspec(dllimport)"
 
 ar_command lib
 
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 34359ef63..52f35a7e8 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -23,5 +23,5 @@ default -> "$(CXX) -shared -Wl,-soname,$(SONAME)"
 </so_link_flags>
 
 <mach_abi_linking>
-amd64   -> "-m64"
+x86_64  -> "-m64"
 </mach_abi_linking>
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 0e4f8baf2..985c534b9 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -24,5 +24,5 @@ i586     -> "-tp p5"
 i686     -> "-tp p6"
 athlon   -> "-tp k7"
 pentium4 -> "-tp p6"
-ia32     -> "-tp px"
+x86_32   -> "-tp px"
 </mach_opt>
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index d0b25d144..43e5fcf8a 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -40,14 +40,18 @@ nehalem    -> "-xtarget=nehalem"
 
 sparc32-v9 -> "-xchip=ultra -xarch=v8"
 
+ultrasparc3 -> "-xchip=ultra3"
+niagra1    -> "-xchip=ultraT1"
+niagra2    -> "-xchip=ultraT2"
+
 sparc32    -> "-xchip=ultra -xarch=SUBMODEL" sparc32-
-sparc64    -> "-xchip=SUBMODEL" sparc64-
+sparc64    -> "-xchip=generic"
 </mach_opt>
 
 <mach_abi_linking>
 # Needed on some Linux distros
-#linux      -> "-library=stlport4"
+linux      -> "-library=stlport4"
 
 sparc64    -> "-xarch=v9"
-amd64      -> "-m64"
+x86_64     -> "-m64"
 </mach_abi_linking>