3 files changed, 19 insertions, 7 deletions
diff --git a/misc/config/arch/amd64 b/misc/config/arch/amd64
index ba67c6b60..8a321ce11 100644
--- a/misc/config/arch/amd64
+++ b/misc/config/arch/amd64
@@ -3,11 +3,18 @@ realname "AMD64"
 default_submodel amd64
 
 <aliases>
-k8
 x86-64
 x86_64 # for RPM
-athlon64
+</aliases>
+
+<submodels>
 opteron
 em64t
 core2duo
-</aliases>
+</submodels>
+
+<submodel_aliases>
+core -> core2duo
+athlon64 -> opteron
+k8 -> opteron
+</submodel_aliases>
diff --git a/misc/config/cc/ekopath b/misc/config/cc/ekopath
index 82e208bd9..abf0b5b1c 100644
--- a/misc/config/cc/ekopath
+++ b/misc/config/cc/ekopath
@@ -13,6 +13,8 @@ check_opt_flags "-O2"
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 
+ar_command "pathCC -ar -o"
+
 so_obj_flags "-fPIC"
 debug_flags "-g"
 
@@ -23,14 +25,14 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 </so_link_flags>
 
 <mach_opt>
-i386     -> "-mcpu=anyx86"
 athlon   -> "-mcpu=athlon"
+pentium4 -> "-mcpu=pentium4"
+
 opteron  -> "-mcpu=opteron"
 em64t    -> "-mcpu=em64t"
-athlon64 -> "-mcpu=athlon64"
-pentium4 -> "-mcpu=pentium4"
+core2duo -> "-mcpu=core"
 
-# Reasonable default
+ia32     -> "-mcpu=anyx86"
 amd64    -> "-mcpu=athlon64"
 </mach_opt>
 
diff --git a/misc/config/cc/gcc b/misc/config/cc/gcc
index 4108b0f0c..f448dc913 100644
--- a/misc/config/cc/gcc
+++ b/misc/config/cc/gcc
@@ -42,6 +42,9 @@ alpha-ev7      -> "-mcpu=ev6"
 ppc601         -> "-mpowerpc -mcpu=601"
 sparc64-ultra3 -> "-mcpu=v9 -mtune=ultrasparc3"
 
+core2duo       -> "-march=nocona -momit-leaf-frame-pointer"
+em64t          -> "-march=nocona -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.