5.4.24-rt15-xanmod1

1 files changed, 59 insertions, 51 deletions

diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh
index f5d6af8110ec..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"
 
@@ -24,32 +24,36 @@ cat << EOF
    11) AMD Family 15h (Steamroller)
    12) AMD Family 15h (Excavator)
    13) AMD Family 17h (Zen)
-   14) Transmeta Crusoe
-   15) Transmeta Efficeon
-   16) IDT Winchip C6
-   17) Winchip-2/Winchip-2A/Winchip-3
-   18) AMD Elan
-   19) Geode GX1 (Cyrix MediaGX)
-   20) AMD Geode GX and LX
-   21) Cyrix III or C3
-   22) VIA C3 "Nehemiah"
-   23) VIA C7
-   24) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit
-   25) Intel Atom
-   26) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
-   27) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
-   28) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
-   29) Intel Silvermont
-   30) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
-   31) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
-   32) Intel 4th Gen Core i3/i5/i7-family (Haswell)
-   33) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
-   34) Intel 6th Gen Core i3/i5/i7-family (Skylake)
-   35) Intel 6th Gen Core i7/i9-family (Skylake X)
-   36) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
-   37) Intel 8th Gen Core i7/i9-family (Ice Lake)
+   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
 
-   38) Native optimizations autodetected by GCC
+   42) Native optimizations autodetected by GCC
 
     0) Generic (default)
     
@@ -72,31 +76,35 @@ case $answer in
    11) Microarchitecture=CONFIG_MSTEAMROLLER ;;
    12) Microarchitecture=CONFIG_MEXCAVATOR ;;
    13) Microarchitecture=CONFIG_MZEN ;;
-   14) Microarchitecture=CONFIG_MCRUSOE ;;
-   15) Microarchitecture=CONFIG_MEFFICEON ;;
-   16) Microarchitecture=CONFIG_MWINCHIPC6 ;;
-   17) Microarchitecture=CONFIG_MWINCHIP3D ;;
-   18) Microarchitecture=CONFIG_MELAN ;;
-   19) Microarchitecture=CONFIG_MGEODEGX1 ;;
-   20) Microarchitecture=CONFIG_MGEODE_LX ;;
-   21) Microarchitecture=CONFIG_MCYRIXIII ;;
-   22) Microarchitecture=CONFIG_MVIAC3_2 ;;
-   23) Microarchitecture=CONFIG_MVIAC7 ;;
-   24) Microarchitecture=CONFIG_MPSC ;;
-   25) Microarchitecture=CONFIG_MATOM ;;
-   26) Microarchitecture=CONFIG_MCORE2 ;;
-   27) Microarchitecture=CONFIG_MNEHALEM ;;
-   28) Microarchitecture=CONFIG_MWESTMERE ;;
-   29) Microarchitecture=CONFIG_MSILVERMONT ;;
-   30) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
-   31) Microarchitecture=CONFIG_MIVYBRIDGE ;;
-   32) Microarchitecture=CONFIG_MHASWELL ;;
-   33) Microarchitecture=CONFIG_MBROADWELL ;;
-   34) Microarchitecture=CONFIG_MSKYLAKE ;;
-   35) Microarchitecture=CONFIG_MSKYLAKEX ;;
-   36) Microarchitecture=CONFIG_MCANNONLAKE ;;
-   37) Microarchitecture=CONFIG_MICELAKE ;;
-   38) Microarchitecture=CONFIG_MNATIVE ;;
+   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