5 files changed, 21 insertions, 15 deletions
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index f4012c150..58b24addb 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -1,4 +1,4 @@
-default_submodel opteron
+default_submodel k8
 
 endian little
 unaligned ok
@@ -9,9 +9,12 @@ x86_64 # for RPM
 </aliases>
 
 <submodels>
-opteron
+k8
+k10
 em64t
 core2
+nehalem
+westmere
 </submodels>
 
 <submodel_aliases>
@@ -19,12 +22,15 @@ core2duo -> core2
 intelcore2 -> core2
 intelcore2duo -> core2
 
-amdopteron -> opteron
-athlon64 -> opteron
-k8 -> opteron
+sledgehammer -> k8
+opteron -> k8
+amdopteron -> k8
+athlon64 -> k8
+barcelona -> k10
 </submodel_aliases>
 
-<simd>
+<isa_extn>
 sse2:all
 ssse3:core2
-</simd>
+aes_ni:westmere
+</isa_extn>
diff --git a/src/build-data/arch/arm.txt b/src/build-data/arch/arm.txt
index 7f8799ad6..b247466e6 100644
--- a/src/build-data/arch/arm.txt
+++ b/src/build-data/arch/arm.txt
@@ -22,6 +22,6 @@ strongarm1110 -> strongarm1100
 armv5tel -> xscale
 </submodel_aliases>
 
-<simd>
+<isa_extn>
 neon:cortex-a8,cortex-a9
-</simd>
+</isa_extn>
diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt
index 62a7070e5..5012909f2 100644
--- a/src/build-data/arch/ia32.txt
+++ b/src/build-data/arch/ia32.txt
@@ -58,7 +58,7 @@ intelcput2600 -> prescott
 intelcput2700 -> prescott
 </submodel_aliases>
 
-<simd>
+<isa_extn>
 sse2:pentium4,prescott,pentium-m,atom
 ssse3:atom
-</simd>
+</isa_extn>
diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt
index 5e96be3c3..b9332913a 100644
--- a/src/build-data/arch/ppc.txt
+++ b/src/build-data/arch/ppc.txt
@@ -22,6 +22,6 @@ ppc7400
 ppc7450
 </submodels>
 
-<simd>
+<isa_extn>
 altivec:ppc7400,ppc7450
-</simd>
+</isa_extn>
diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
index 9602012ed..36c92d198 100644
--- a/src/build-data/arch/ppc64.txt
+++ b/src/build-data/arch/ppc64.txt
@@ -25,6 +25,6 @@ cellppu
 cellbroadbandengine -> cellppu
 </submodel_aliases>
 
-<simd>
+<isa_extn>
 altivec:cellppu,ppc970,power6,power7
-</simd>
+</isa_extn>