From 40a3bd822e74408ae5ce3a10dbe595878c7c8583 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 2 Jun 2016 11:07:29 +0000 Subject: gcc: Remove 'with-cpu', not compatible with 'with-arch' The following error was happening after upgrading to GCC 5.3.0 in armv7lhf builds: Switch "--with-arch" may not be used with switch "--with-cpu" Also, I could find other places where this flag was removed when upgrading to GCC 5: http://pkgs.fedoraproject.org/cgit/rpms/gcc.git/commit/gcc.spec?id=7f999936529d6902d43c8cc807ceb3a6843f3072 Change-Id: Ib3934098518dc496d3c9d29a9c7f97a7cfeab9c7 --- strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph | 1 - strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph | 1 - strata/build-essential/gcc.morph | 1 - strata/build-essential/stage1-gcc.morph | 1 - strata/build-essential/stage2-gcc.morph | 1 - 5 files changed, 5 deletions(-) diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph index b5a8c338..b43577f4 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph @@ -23,7 +23,6 @@ configure-commands: case "$MORPH_ARCH" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ --with-fpu=vfpv3-d16 \ --with-float=hard" ;; diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph index 140a29b1..d5c1a14a 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph @@ -14,7 +14,6 @@ configure-commands: case "$MORPH_ARCH" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ --with-fpu=vfpv3-d16 \ --with-float=hard" ;; diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph index f16b3c0e..18459b73 100644 --- a/strata/build-essential/gcc.morph +++ b/strata/build-essential/gcc.morph @@ -28,7 +28,6 @@ configure-commands: - | case "$MORPH_ARCH" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ --with-fpu=vfpv3-d16 \ --with-float=hard" ;; diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph index 6418ed6a..c439a912 100644 --- a/strata/build-essential/stage1-gcc.morph +++ b/strata/build-essential/stage1-gcc.morph @@ -28,7 +28,6 @@ configure-commands: - | case "$MORPH_ARCH" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ --with-fpu=vfpv3-d16 \ --with-float=hard" ;; diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph index cd600e18..6f211e83 100644 --- a/strata/build-essential/stage2-gcc.morph +++ b/strata/build-essential/stage2-gcc.morph @@ -22,7 +22,6 @@ configure-commands: - | case "$MORPH_ARCH" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ --with-fpu=vfpv3-d16 \ --with-float=hard" ;; -- cgit v1.2.1