Delete uneeded files

1 files changed, 85 insertions, 44 deletions

diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh
index d1f1367c37ad..ccf182e91190 100755
--- a/choose-gcc-optimization.sh
+++ b/choose-gcc-optimization.sh
@@ -3,7 +3,7 @@
 . /usr/share/makepkg/util/message.sh
 colorize
 
-Detect_CPU=$(gcc -c -Q -march=native --help=target | grep march | awk '{print $2}')
+Detect_CPU=$(gcc -c -Q -march=native --help=target | grep march | awk '{print $2}' | head -1)
 
 msg "Detected CPU architecture: $Detect_CPU"
 
@@ -11,30 +11,49 @@ cat << EOF
 
     Available CPU microarchitectures:
 
-    1) AMD old K8-family    
-    2) AMD Improved K8-family (SSE3)
-    3) AMD K10-family
-    4) AMD Family 10h (Barcelona)
-    5) AMD Family 14h (Bobcat)
-    6) AMD Family 16h (Jaguar)
-    7) AMD Family 15h (Bulldozer)
-    8) AMD Family 15h (Piledriver)
-    9) AMD Family 15h (Steamroller)
-    10) AMD Family 15h (Excavator)
-    11) AMD Family 17h (Zen)
+    1) AMD K6/K6-II/K6-III
+    2) AMD Athlon/Duron/K7
+    3) AMD Opteron/Athlon64/Hammer/K8
+    4) AMD Opteron/Athlon64/Hammer/K8 with SSE3
+    5) AMD 61xx/7x50/PhenomX3/X4/II/K10
+    6) AMD Family 10h (Barcelona)
+    7) AMD Family 14h (Bobcat)
+    8) AMD Family 16h (Jaguar)
+    9) AMD Family 15h (Bulldozer)
+   10) AMD Family 15h (Piledriver)
+   11) AMD Family 15h (Steamroller)
+   12) AMD Family 15h (Excavator)
+   13) AMD Family 17h (Zen)
+   14) AMD Family 17h (Zen 2)
+   15) Transmeta Crusoe
+   16) Transmeta Efficeon
+   17) IDT Winchip C6
+   18) Winchip-2/Winchip-2A/Winchip-3
+   19) AMD Elan
+   20) Geode GX1 (Cyrix MediaGX)
+   21) AMD Geode GX and LX
+   22) Cyrix III or C3
+   23) VIA C3 "Nehemiah"
+   24) VIA C7
+   25) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit
+   26) Intel Atom
+   27) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
+   28) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
+   29) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
+   30) Intel Silvermont
+   31) Intel Goldmont (Apollo Lake and Denverton)
+   32) Intel Goldmont Plus (Gemini Lake)
+   33) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
+   34) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
+   35) Intel 4th Gen Core i3/i5/i7-family (Haswell)
+   36) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
+   37) Intel 6th Gen Core i3/i5/i7-family (Skylake)
+   38) Intel 6th Gen Core i7/i9-family (Skylake X)
+   39) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
+   40) Intel 8th Gen Core i7/i9-family (Ice Lake)
+   41) Xeon processors in the Cascade Lake family
 
-    12) Intel P4 / older Netburst based Xeon (Core2)        
-    13) Intel Bonnell family of low-power Atom processors (Bonnell)
-    14) Intel Silvermont family of low-power Atom processors (Silvermont)
-    15) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
-    16) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
-    17) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
-    18) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
-    19) Intel 4th Gen Core i3/i5/i7-family (Haswell)
-    20) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
-    21) Intel 6th Gen Core i3/i5/i7-family (Skylake)
-
-    22) Native optimizations autodetected by GCC
+   42) Native optimizations autodetected by GCC
 
     0) Generic (default)
     
@@ -44,26 +63,48 @@ sleep 1
 answer=$1
 
 case $answer in
-    1) Microarchitecture=CONFIG_MK8 ;;
-    2) Microarchitecture=CONFIG_MK8SSE3 ;;
-    3) Microarchitecture=CONFIG_MK10 ;;
-    4) Microarchitecture=CONFIG_MBARCELONA ;;
-    5) Microarchitecture=CONFIG_MBOBCAT ;;
-    6) Microarchitecture=CONFIG_MJAGUAR ;;
-    7) Microarchitecture=CONFIG_MBULLDOZER ;;
-    8) Microarchitecture=CONFIG_MPILEDRIVER ;;
-    9|10|11) Microarchitecture=CONFIG_MNATIVE ;;   # Xanmod doesn't include those architectures!! Switch to native instead
-    12) Microarchitecture=CONFIG_MPSC ;;
-    13) Microarchitecture=CONFIG_MATOM ;;
-    14) Microarchitecture=CONFIG_MSILVERMONT ;;
-    15) Microarchitecture=CONFIG_MNEHALEM ;;
-    16) Microarchitecture=CONFIG_MWESTMERE ;;
-    17) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
-    18) Microarchitecture=CONFIG_MIVYBRIDGE ;;
-    19) Microarchitecture=CONFIG_MHASWELL ;;
-    20) Microarchitecture=CONFIG_MBROADWELL ;;
-    21) Microarchitecture=CONFIG_MNATIVE ;;    # Xanmod doesn't include this architecture!! Switch to native instead
-    22) Microarchitecture=CONFIG_MNATIVE ;;
+    1) Microarchitecture=CONFIG_MK6 ;;
+    2) Microarchitecture=CONFIG_MK7 ;;
+    3) Microarchitecture=CONFIG_MK8 ;;
+    4) Microarchitecture=CONFIG_MK8SSE3 ;;
+    5) Microarchitecture=CONFIG_MK10 ;;
+    6) Microarchitecture=CONFIG_MBARCELONA ;;
+    7) Microarchitecture=CONFIG_MBOBCAT ;;
+    8) Microarchitecture=CONFIG_MJAGUAR ;;
+    9) Microarchitecture=CONFIG_MBULLDOZER ;;
+   10) Microarchitecture=CONFIG_MPILEDRIVER ;;
+   11) Microarchitecture=CONFIG_MSTEAMROLLER ;;
+   12) Microarchitecture=CONFIG_MEXCAVATOR ;;
+   13) Microarchitecture=CONFIG_MZEN ;;
+   14) Microarchitecture=CONFIG_MZEN2 ;;
+   15) Microarchitecture=CONFIG_MCRUSOE ;;
+   16) Microarchitecture=CONFIG_MEFFICEON ;;
+   17) Microarchitecture=CONFIG_MWINCHIPC6 ;;
+   18) Microarchitecture=CONFIG_MWINCHIP3D ;;
+   19) Microarchitecture=CONFIG_MELAN ;;
+   20) Microarchitecture=CONFIG_MGEODEGX1 ;;
+   21) Microarchitecture=CONFIG_MGEODE_LX ;;
+   22) Microarchitecture=CONFIG_MCYRIXIII ;;
+   23) Microarchitecture=CONFIG_MVIAC3_2 ;;
+   24) Microarchitecture=CONFIG_MVIAC7 ;;
+   25) Microarchitecture=CONFIG_MPSC ;;
+   26) Microarchitecture=CONFIG_MATOM ;;
+   27) Microarchitecture=CONFIG_MCORE2 ;;
+   28) Microarchitecture=CONFIG_MNEHALEM ;;
+   29) Microarchitecture=CONFIG_MWESTMERE ;;
+   30) Microarchitecture=CONFIG_MSILVERMONT ;;
+   31) Microarchitecture=CONFIG_MGOLDMONT ;;
+   32) Microarchitecture=CONFIG_MGOLDMONTPLUS ;;
+   33) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
+   34) Microarchitecture=CONFIG_MIVYBRIDGE ;;
+   35) Microarchitecture=CONFIG_MHASWELL ;;
+   36) Microarchitecture=CONFIG_MBROADWELL ;;
+   37) Microarchitecture=CONFIG_MSKYLAKE ;;
+   38) Microarchitecture=CONFIG_MSKYLAKEX ;;
+   39) Microarchitecture=CONFIG_MCANNONLAKE ;;
+   40) Microarchitecture=CONFIG_MICELAKE ;;
+   41) Microarchitecture=CONFIG_MCASCADELAKE ;;
+   42) Microarchitecture=CONFIG_MNATIVE ;;
     *) default=CONFIG_GENERIC_CPU ;;
 esac