diff --git a/SPECS/glibc.spec b/SPECS/glibc.spec index 30bf4b5d..53ce8258 100644 --- a/SPECS/glibc.spec +++ b/SPECS/glibc.spec @@ -80,7 +80,7 @@ # or supported. This means that RHEL7 BE will only run on POWER7 or newer # hardware, and LE will only run on POWER8 or newer hardware. # -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64le # Build the additional runtimes for 32-bit and 64-bit BE POWER. %define buildpower6 0 # Disabled - %%define buildpower8 1 - See note above. @@ -1690,8 +1690,8 @@ package or when debugging this package. %patch1024 -p1 %patch1025 -p1 %patch1026 -p1 -%patch1027 -p1 -%patch1028 -p1 +#%patch1027 -p1 +#%patch1028 -p1 %patch1029 -p1 %patch1030 -p1 %patch1031 -p1 @@ -1700,7 +1700,7 @@ package or when debugging this package. %patch0045 -p1 %patch1047 -p1 %patch1034 -p1 -%patch1058 -p1 +#%patch1058 -p1 %patch1035 -p1 %patch1059 -p1 %patch1036 -p1 @@ -1725,42 +1725,41 @@ package or when debugging this package. %patch1063 -p1 %patch2053 -p1 # Apply ldbl_high() patch for both ppc64le and ppc64. -%patch1110 -p1 +#%patch1110 -p1 # PPC64LE Patch set: # 1064 to 1109. - %patch1064 -p1 %patch1065 -p1 -%patch1066 -p1 -%patch1067 -p1 -%patch1068 -p1 -%patch1069 -p1 +#%patch1066 -p1 +#%patch1067 -p1 +#%patch1068 -p1 +#%patch1069 -p1 %patch1070 -p1 -%patch1071 -p1 +#%patch1071 -p1 %patch1072 -p1 -%patch1073 -p1 +#%patch1073 -p1 %patch1074 -p1 %patch1075 -p1 -%patch1076 -p1 +#%patch1076 -p1 %patch1077 -p1 %patch1078 -p1 %patch1079 -p1 -%patch1080 -p1 +#%patch1080 -p1 %patch1081 -p1 -%patch1082 -p1 +#%patch1082 -p1 %patch1083 -p1 %patch1084 -p1 -%patch1085 -p1 +#%patch1085 -p1 %patch1086 -p1 %patch1087 -p1 -%patch1088 -p1 +#%patch1088 -p1 %patch1089 -p1 -%patch1090 -p1 +#%patch1090 -p1 %patch1091 -p1 %patch1092 -p1 -%patch1093 -p1 -%patch1094 -p1 +#%patch1093 -p1 +#%patch1094 -p1 %patch1095 -p1 %patch1096 -p1 %patch1097 -p1 @@ -1775,7 +1774,7 @@ package or when debugging this package. %patch1106 -p1 %patch1107 -p1 %patch1108 -p1 -%patch1109 -p1 +#%patch1109 -p1 %patch1112 -p1 # End of PPC64LE Patch Set. @@ -1829,10 +1828,10 @@ package or when debugging this package. %patch1545 -p1 %patch1546 -p1 %patch1547 -p1 -%patch1548 -p1 +#%patch1548 -p1 %patch1549 -p1 %patch1550 -p1 -%patch1551 -p1 +#%patch1551 -p1 %patch1552 -p1 %patch1553 -p1 %patch1554 -p1 @@ -1853,7 +1852,7 @@ package or when debugging this package. # End of IBM IFUNC patch set. %patch1570 -p1 %patch1571 -p1 -%patch1572 -p1 +#%patch1572 -p1 %patch1573 -p1 %patch0063 -p1 %patch2064 -p1 @@ -1891,8 +1890,8 @@ package or when debugging this package. %patch1602 -p1 %patch1603 -p1 %patch1604 -p1 -%patch1605 -p1 -%patch1606 -p1 +#%patch1605 -p1 +#%patch1606 -p1 %patch2066 -p1 %patch20670 -p1 %patch2067 -p1 @@ -1922,7 +1921,7 @@ package or when debugging this package. %patch2091 -p1 # Rebase of microbenchmarks. -%patch1607 -p1 +#%patch1607 -p1 %patch1609 -p1 %patch1610 -p1 %patch1611 -p1 @@ -1937,9 +1936,9 @@ package or when debugging this package. %patch1618 -p1 %patch1619 -p1 %patch1620 -p1 -%patch1621 -p1 -%patch1622 -p1 -%patch1623 -p1 +#%patch1621 -p1 +#%patch1622 -p1 +#%patch1623 -p1 # Backport of upstream IBM z13 patches for RHEL 7.3 %patch1624 -p1 @@ -1951,27 +1950,27 @@ package or when debugging this package. %patch1630 -p1 %patch1631 -p1 %patch1632 -p1 -%patch1633 -p1 -%patch1634 -p1 -%patch1635 -p1 -%patch1636 -p1 -%patch1637 -p1 -%patch1638 -p1 -%patch1639 -p1 -%patch1640 -p1 -%patch1641 -p1 -%patch1642 -p1 -%patch1643 -p1 -%patch1644 -p1 -%patch1645 -p1 -%patch1646 -p1 -%patch1647 -p1 -%patch1648 -p1 -%patch1649 -p1 -%patch1650 -p1 -%patch1651 -p1 -%patch1652 -p1 -%patch1653 -p1 +#%patch1633 -p1 +#%patch1634 -p1 +#%patch1635 -p1 +#%patch1636 -p1 +#%patch1637 -p1 +#%patch1638 -p1 +#%patch1639 -p1 +#%patch1640 -p1 +#%patch1641 -p1 +#%patch1642 -p1 +#%patch1643 -p1 +#%patch1644 -p1 +#%patch1645 -p1 +#%patch1646 -p1 +#%patch1647 -p1 +#%patch1648 -p1 +#%patch1649 -p1 +#%patch1650 -p1 +#%patch1651 -p1 +#%patch1652 -p1 +#%patch1653 -p1 %patch1654 -p1 %patch1123 -p1 @@ -1992,16 +1991,16 @@ package or when debugging this package. %patch1667 -p1 %patch1668 -p1 %patch1669 -p1 -%patch1670 -p1 +#%patch1670 -p1 %patch1671 -p1 %patch1672 -p1 %patch1675 -p1 # RHBZ #1324427, parts 1 through 3 -%patch1676 -p1 -%patch1677 -p1 -%patch1678 -p1 +#%patch1676 -p1 +#%patch1677 -p1 +#%patch1678 -p1 # RHBZ #1234449, parts 1 through 4 %patch1679 -p1 @@ -2034,7 +2033,7 @@ package or when debugging this package. %patch1698 -p1 # RHBZ #1211823 -%patch1699 -p1 +#%patch1699 -p1 # RHBZ #1268050, parts 1 through 5 %patch1700 -p1 @@ -2055,62 +2054,62 @@ package or when debugging this package. %patch1711 -p1 %patch1712 -p1 -%patch1713 -p1 +#%patch1713 -p1 %patch1714 -p1 %patch1715 -p1 # RHBZ #1256317, IS_IN backports, parts 1 through 22. -%patch1716 -p1 +#%patch1716 -p1 %patch1717 -p1 %patch1718 -p1 %patch1719 -p1 -%patch1720 -p1 -%patch1721 -p1 -%patch1722 -p1 -%patch1723 -p1 -%patch1724 -p1 +#%patch1720 -p1 +#%patch1721 -p1 +#%patch1722 -p1 +#%patch1723 -p1 +#%patch1724 -p1 %patch1725 -p1 %patch1726 -p1 -%patch1727 -p1 -%patch1728 -p1 +#%patch1727 -p1 +#%patch1728 -p1 %patch1729 -p1 -%patch1730 -p1 -%patch1731 -p1 -%patch1732 -p1 -%patch1733 -p1 -%patch1734 -p1 -%patch1735 -p1 -%patch1736 -p1 -%patch1737 -p1 - -%patch1738 -p1 -%patch1739 -p1 +#%patch1730 -p1 +#%patch1731 -p1 +#%patch1732 -p1 +#%patch1733 -p1 +#%patch1734 -p1 +#%patch1735 -p1 +#%patch1736 -p1 +#%patch1737 -p1 + +#%patch1738 -p1 +#%patch1739 -p1 # RHBZ #1292018, patches 1 through 10. -%patch1740 -p1 -%patch1741 -p1 +#%patch1740 -p1 +#%patch1741 -p1 %patch1742 -p1 -%patch1743 -p1 -%patch1744 -p1 -%patch1745 -p1 -%patch1746 -p1 -%patch1747 -p1 -%patch1748 -p1 -%patch1749 -p1 +#%patch1743 -p1 +#%patch1744 -p1 +#%patch1745 -p1 +#%patch1746 -p1 +#%patch1747 -p1 +#%patch1748 -p1 +#%patch1749 -p1 %patch1750 -p1 # RHBZ #1298526, patch 1 of 5. -%patch1751 -p1 -%patch1752 -p1 -%patch1753 -p1 -%patch1754 -p1 +#%patch1751 -p1 +#%patch1752 -p1 +#%patch1753 -p1 +#%patch1754 -p1 %patch1755 -p1 %patch1756 -p1 %patch1757 -p1 %patch17580 -p1 -%patch1758 -p1 +#%patch1758 -p1 %patch1759 -p1 %patch1760 -p1 %patch1761 -p1 @@ -2120,8 +2119,8 @@ package or when debugging this package. %patch1765 -p1 %patch1766 -p1 %patch1767 -p1 -%patch1768 -p1 -%patch1769 -p1 +#%patch1768 -p1 +#%patch1769 -p1 %patch1770 -p1 %patch1771 -p1 %patch1772 -p1 @@ -2131,39 +2130,39 @@ package or when debugging this package. %patch1776 -p1 %patch1777 -p1 %patch1778 -p1 -%patch1779 -p1 -%patch1780 -p1 +#%patch1779 -p1 +#%patch1780 -p1 %patch1781 -p1 %patch1782 -p1 -%patch1783 -p1 -%patch1784 -p1 +#%patch1783 -p1 +#%patch1784 -p1 %patch1785 -p1 -%patch1786 -p1 -%patch1787 -p1 -%patch1788 -p1 +#%patch1786 -p1 +#%patch1787 -p1 +#%patch1788 -p1 %patch1789 -p1 -%patch1790 -p1 +#%patch1790 -p1 %patch1791 -p1 -%patch1792 -p1 +#%patch1792 -p1 %patch1793 -p1 -%patch1794 -p1 -%patch1795 -p1 -%patch1796 -p1 -%patch1797 -p1 +#%patch1794 -p1 +#%patch1795 -p1 +#%patch1796 -p1 +#%patch1797 -p1 %patch1798 -p1 -%patch1799 -p1 -%patch1800 -p1 -%patch1801 -p1 -%patch1802 -p1 +#%patch1799 -p1 +#%patch1800 -p1 +#%patch1801 -p1 +#%patch1802 -p1 %patch1803 -p1 %patch1804 -p1 -%patch1805 -p1 -%patch1806 -p1 +#%patch1805 -p1 +#%patch1806 -p1 %patch1807 -p1 %patch1808 -p1 %patch1809 -p1 -%patch1810 -p1 -%patch1811 -p1 +#%patch1810 -p1 +#%patch1811 -p1 %patch1812 -p1 %patch1813 -p1 %patch1814 -p1 @@ -2172,9 +2171,9 @@ package or when debugging this package. %patch1817 -p1 %patch1818 -p1 %patch1819 -p1 -%patch1820 -p1 -%patch1821 -p1 -%patch1822 -p1 +#%patch1820 -p1 +#%patch1821 -p1 +#%patch1822 -p1 %patch1823 -p1 %patch1824 -p1 %patch1825 -p1 @@ -2182,8 +2181,8 @@ package or when debugging this package. %patch1827 -p1 %patch1828 -p1 %patch1829 -p1 -%patch1830 -p1 -%patch1831 -p1 +#%patch1830 -p1 +#%patch1831 -p1 # RHBZ #841653 - Intel lock elision patch set. %patch1832 -p1 %patch1833 -p1 @@ -2202,25 +2201,25 @@ package or when debugging this package. %patch1846 -p1 %patch1847 -p1 %patch1848 -p1 -%patch1849 -p1 +#%patch1849 -p1 # End of Intel lock elision patch set. # RHBZ #731835 - IBM POWER lock elision patch set. %patch1850 -p1 %patch1851 -p1 -%patch1852 -p1 +#%patch1852 -p1 # End of IBM POWER lock elision patch set. %patch1853 -p1 %patch1854 -p1 # Built-in list of syscall names. -%patch1855 -p1 +#%patch1855 -p1 %patch1856 -p1 -%patch1857 -p1 -%patch1858 -p1 +#%patch1857 -p1 +#%patch1858 -p1 %patch1859 -p1 -%patch1860 -p1 +#%patch1860 -p1 %patch1861 -p1 %patch1862 -p1 @@ -2230,67 +2229,67 @@ package or when debugging this package. %patch1866 -p1 %patch1867 -p1 -%patch1868 -p1 -%patch1869 -p1 -%patch1870 -p1 -%patch1871 -p1 +#%patch1868 -p1 +#%patch1869 -p1 +#%patch1870 -p1 +#%patch1871 -p1 %patch1872 -p1 -%patch1873 -p1 -%patch1874 -p1 -%patch1875 -p1 -%patch1876 -p1 +#%patch1873 -p1 +#%patch1874 -p1 +#%patch1875 -p1 +#%patch1876 -p1 %patch1877 -p1 %patch2092 -p1 %patch2093 -p1 %patch2094 -p1 -%patch2095 -p1 +#%patch2095 -p1 %patch2096 -p1 %patch2097 -p1 %patch2098 -p1 %patch2099 -p1 -%patch2100 -p1 -%patch2101 -p1 -%patch2102 -p1 +#%patch2100 -p1 +#%patch2101 -p1 +#%patch2102 -p1 %patch2103 -p1 -%patch2104 -p1 -%patch2105 -p1 +#%patch2104 -p1 +#%patch2105 -p1 %patch2106 -p1 -%patch2107 -p1 -%patch2108 -p1 +#%patch2107 -p1 +#%patch2108 -p1 %patch2109 -p1 -%patch2110 -p1 -%patch2111 -p1 +#%patch2110 -p1 +#%patch2111 -p1 %patch2112 -p1 %patch2113 -p1 %patch1878 -p1 -%patch1879 -p1 -%patch1880 -p1 +#%patch1879 -p1 +#%patch1880 -p1 %patch1881 -p1 %patch1882 -p1 -%patch1883 -p1 +#%patch1883 -p1 %patch1884 -p1 %patch1885 -p1 %patch1886 -p1 %patch1887 -p1 %patch1888 -p1 %patch1889 -p1 -%patch1890 -p1 -%patch1891 -p1 -%patch1892 -p1 +#%patch1890 -p1 +#%patch1891 -p1 +#%patch1892 -p1 -%patch1893 -p1 -%patch1894 -p1 -%patch1895 -p1 +#%patch1893 -p1 +#%patch1894 -p1 +#%patch1895 -p1 %patch1896 -p1 %patch1897 -p1 %patch1898 -p1 %patch1899 -p1 %patch1900 -p1 %patch1901 -p1 -%patch1902 -p1 +#%patch1902 -p1 ############################################################################## # %%prep - Additional prep required... @@ -2350,9 +2349,9 @@ df # %%build - x86 options. ############################################################################## # On x86 we build for the specific target cpu rpm is using. -%ifarch %{ix86} -BuildFlags="-march=%{_target_cpu} -mtune=generic" -%endif +#%ifarch %{ix86} +#BuildFlags="-march=%{_target_cpu} -mtune=generic" +#%endif %ifarch i686 BuildFlags="-march=i686 -mtune=generic" %endif @@ -2360,7 +2359,8 @@ BuildFlags="-march=i686 -mtune=generic" BuildFlags="$BuildFlags -mno-tls-direct-seg-refs" %endif %ifarch x86_64 -BuildFlags="-mtune=generic" +#BuildFlags="-m64 -O3 -march=core2 -mtune=core2 -mmmx -msse -msse2 -mssse3 -msse4 -msse4.1 -msse4.2 -mavx" +BuildFlags="-march=core2 -mtune=core2" %endif ############################################################################## @@ -2403,9 +2403,9 @@ core_with_options="--with-cpu=power7" %endif %ifarch %{power64} BuildFlags="" -%ifarch ppc64le -GCC="$GCC -mcpu=power8 -mtune=power8" -GXX="$GXX -mcpu=power8 -mtune=power8" +%ifarch ppc64 ppc64le +GCC="$GCC -m64 -O3 -mcpu=power8 -mtune=power8" +GXX="$GXX -m64 -O3 -mcpu=power8 -mtune=power8" core_with_options="--with-cpu=power8" %else GCC="$GCC -m64 -mcpu=power7 -mtune=power7" @@ -2525,8 +2525,8 @@ build power6 %if %{buildpower8} ( - GCC="$GCC -mcpu=power8 -mtune=power8" - GXX="$GXX -mcpu=power8 -mtune=power8" + GCC="$GCC -m64 -O3 -mcpu=power8 -mtune=power8" + GXX="$GXX -m64 -O3 -mcpu=power8 -mtune=power8" core_with_options="--with-cpu=power8" build power8 )