7 files changed, 14 insertions, 11 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 8e0de0183..733646524 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -20,7 +20,7 @@
 #define BOTAN_DISTRIBUTION_INFO "%{distribution_info}"
 
 #ifndef BOTAN_DLL
-  #define BOTAN_DLL %{dll_import_flags}
+  #define BOTAN_DLL %{visibility_attribute}
 #endif
 
 /* Chunk sizes */
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 5f522cdb6..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
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 101f6babb..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"
 
-x86      -> "-mcpu=anyx86"
+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 f82b9d36f..f75239666 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -17,11 +17,12 @@ maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overf
 
 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
 
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/os/solaris.txt b/src/build-data/os/solaris.txt
index 47e7bccbc..571c594d1 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -1,5 +1,8 @@
 os_type unix
 
+install_cmd_data 'cp'
+install_cmd_exec 'cp'
+
 <target_features>
 posix_mlock
 gettimeofday