packaging: Bootstrap compiler optimization

Change-Id: Ie1e12ff3ae5c0550254f58da4750830e5739d3f5

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index ed47e43..7a34932 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -681,6 +681,9 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(sse\|fpmath\)[^ ]*//g'`
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  */ /g'`
 %{?asan: RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS -DASAN_INIT_FIRST) }
 
+%ifarch armv7l armv7hl aarch64
+%undefine gcc_profiledbootstrap
+%endif
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
 TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
@@ -693,7 +696,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --enable-languages=c,c++,fortran \
        --enable-checking=release \
        --disable-libssp \
-       --disable-bootstrap \
+       %{!?gcc_profiledbootstrap:--disable-bootstrap} \
        --disable-libvtv \
        --enable-plugin \
        --disable-libcc1 \
@@ -771,7 +774,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --host=%{host_arch} \
        --build=%{host_arch}
 
-make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %{!?cross:%{?gcc_profiledbootstrap:profiledbootstrap}}
 %{?gcc_run_tests:
   echo "Run testsuite"
   # asan needs a whole shadow address space

diff --git a/packaging/gcc-armv7hl.spec b/packaging/gcc-armv7hl.spec
index 7ef98ad..a5aef37 100644 (file)
--- a/packaging/gcc-armv7hl.spec
+++ b/packaging/gcc-armv7hl.spec
@@ -679,8 +679,11 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(arch\|tune\|cpu\)=[^ ]*//g'`
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(sse\|fpmath\)[^ ]*//g'`
 }
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  */ /g'`
+%{?asan: RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS -DASAN_INIT_FIRST) }
 
-
+%ifarch armv7l armv7hl aarch64
+%undefine gcc_profiledbootstrap
+%endif
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
 TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
@@ -693,7 +696,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --enable-languages=c,c++,fortran \
        --enable-checking=release \
        --disable-libssp \
-       --disable-bootstrap \
+       %{!?gcc_profiledbootstrap:--disable-bootstrap} \
        --disable-libvtv \
        --enable-plugin \
        --disable-libcc1 \
@@ -771,7 +774,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --host=%{host_arch} \
        --build=%{host_arch}
 
-make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %{!?cross:%{?gcc_profiledbootstrap:profiledbootstrap}}
 %{?gcc_run_tests:
   echo "Run testsuite"
   # asan needs a whole shadow address space

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index 3562448..74b06d2 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -681,6 +681,9 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(sse\|fpmath\)[^ ]*//g'`
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  */ /g'`
 %{?asan: RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS -DASAN_INIT_FIRST) }
 
+%ifarch armv7l armv7hl aarch64
+%undefine gcc_profiledbootstrap
+%endif
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
 TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
@@ -693,7 +696,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --enable-languages=c,c++,fortran \
        --enable-checking=release \
        --disable-libssp \
-       --disable-bootstrap \
+       %{!?gcc_profiledbootstrap:--disable-bootstrap} \
        --disable-libvtv \
        --enable-plugin \
        --disable-libcc1 \
@@ -771,7 +774,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --host=%{host_arch} \
        --build=%{host_arch}
 
-make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %{!?cross:%{?gcc_profiledbootstrap:profiledbootstrap}}
 %{?gcc_run_tests:
   echo "Run testsuite"
   # asan needs a whole shadow address space

diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index 31ffa15..9de25fc 100644 (file)
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -678,6 +678,9 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(sse\|fpmath\)[^ ]*//g'`
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  */ /g'`
 %{?asan: RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS -DASAN_INIT_FIRST) }
 
+%ifarch armv7l armv7hl aarch64
+%undefine gcc_profiledbootstrap
+%endif
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
 TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
@@ -690,7 +693,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --enable-languages=c,c++,fortran \
        --enable-checking=release \
        --disable-libssp \
-       --disable-bootstrap \
+       %{!?gcc_profiledbootstrap:--disable-bootstrap} \
        --disable-libvtv \
        --enable-plugin \
        --disable-libcc1 \
@@ -768,7 +771,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \
        --host=%{host_arch} \
        --build=%{host_arch}
 
-make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %{!?cross:%{?gcc_profiledbootstrap:profiledbootstrap}}
 %{?gcc_run_tests:
   echo "Run testsuite"
   # asan needs a whole shadow address space