6 files changed, 31 insertions, 19 deletions
diff --git a/src/block/aes_ni/info.txt b/src/block/aes_ni/info.txt
index 604bf502c..270b00d9d 100644
--- a/src/block/aes_ni/info.txt
+++ b/src/block/aes_ni/info.txt
@@ -2,7 +2,7 @@ define AES_NI 20131128
 
 load_on auto
 
-need_isa aes-ni
+need_isa aesni
 
 <requires>
 aes_isa_eng
diff --git a/src/build-data/arch/x86_32.txt b/src/build-data/arch/x86_32.txt
index 4562050af..54f821a84 100644
--- a/src/build-data/arch/x86_32.txt
+++ b/src/build-data/arch/x86_32.txt
@@ -67,6 +67,9 @@ ssse3
 sse4.1
 sse4.2
 avx2
-aes-ni
+bmi2
+aesni
 clmul
+rdrand
+sha
 </isa_extensions>
diff --git a/src/build-data/arch/x86_64.txt b/src/build-data/arch/x86_64.txt
index e3e6f18e1..56a1b8ed3 100644
--- a/src/build-data/arch/x86_64.txt
+++ b/src/build-data/arch/x86_64.txt
@@ -42,6 +42,9 @@ ssse3
 sse4.1
 sse4.2
 avx2
-aes-ni
+aesni
 clmul
+rdrand
+sha
+bmi2
 </isa_extensions>
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 163e64272..e39d942fb 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -30,14 +30,16 @@ darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
 </so_link_flags>
 
 <isa_flags>
-"sse2"   -> "-msse2"
-"ssse3"  -> "-mssse3"
-"sse4.1" -> "-msse4.1"
-"sse4.2" -> "-msse4.2"
-"avx"    -> "-mavx"
-"aes-ni" -> "-maes"
-"avx2"   -> "-mavx2"
-"bmi2"   -> "-mbmi2"
+sse2   -> "-msse2"
+ssse3  -> "-mssse3"
+sse4.1 -> "-msse4.1"
+sse4.2 -> "-msse4.2"
+avx2   -> "-mavx2"
+bmi2   -> "-mbmi2"
+aesni  -> "-maes"
+clmul  -> "-mclmul"
+rdrand -> "-mrdrnd"
+sha    -> "-msha"
 </isa_flags>
 
 <mach_opt>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 52d5020e2..ddc1e3f84 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -38,14 +38,16 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 </so_link_flags>
 
 <isa_flags>
-"sse2"   -> "-msse2"
-"ssse3"  -> "-mssse3"
-"sse4.1" -> "-msse4.1"
-"sse4.2" -> "-msse4.2"
-"avx"    -> "-mavx"
-"aes-ni" -> "-maes"
-"avx2"   -> "-mavx2"
-"bmi2"   -> "-mbmi2"
+sse2   -> "-msse2"
+ssse3  -> "-mssse3"
+sse4.1 -> "-msse4.1"
+sse4.2 -> "-msse4.2"
+avx2   -> "-mavx2"
+bmi2   -> "-mbmi2"
+aesni  -> "-maes"
+clmul  -> "-mclmul"
+rdrand -> "-mrdrnd"
+sha    -> "-msha"
 </isa_flags>
 
 <mach_opt>
diff --git a/src/entropy/rdrand/info.txt b/src/entropy/rdrand/info.txt
index 5c74e6c25..546ab699a 100644
--- a/src/entropy/rdrand/info.txt
+++ b/src/entropy/rdrand/info.txt
@@ -1,5 +1,7 @@
 define ENTROPY_SRC_RDRAND 20131128
 
+need_isa rdrand
+
 <source>
 rdrand.cpp
 </source>