git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From a9292f711375c12c5135b207698e623e297b049b Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Thu, 20 Apr 2017 10:11:16 -0700
   4 Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm
   5  architecture
   6
   7 We can not assume that all arches armv7+ are cortex-a8 only
   8 it fails to build for rpi which is armv7ve based (cortex-a8) cpu
   9 implementation.
  10 Fixes
  11 | cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch
  12
  13 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
  14
  15 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  16 ---
  17  helgrind/tests/Makefile.am |  6 +++---
  18  none/tests/arm/Makefile.am | 18 +++++++++---------
  19  2 files changed, 12 insertions(+), 12 deletions(-)
  20
  21 diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
  22 index d7101ed..670c29f 100755
  23 --- a/helgrind/tests/Makefile.am
  24 +++ b/helgrind/tests/Makefile.am
  25 @@ -226,9 +226,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
  26  endif
  27
  28  if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
  29 -annotate_hbefore_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8
  30 -tc07_hbl1_CFLAGS        = $(AM_CFLAGS) -mcpu=cortex-a8
  31 -tc08_hbl2_CFLAGS        = $(AM_CFLAGS) -mcpu=cortex-a8
  32 +annotate_hbefore_CFLAGS = $(AM_CFLAGS)
  33 +tc07_hbl1_CFLAGS        = $(AM_CFLAGS)
  34 +tc08_hbl2_CFLAGS        = $(AM_CFLAGS)
  35  else
  36  annotate_hbefore_CFLAGS = $(AM_CFLAGS)
  37  tc07_hbl1_CFLAGS        = $(AM_CFLAGS)
  38 diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
  39 index 41a5a03..a76981e 100644
  40 --- a/none/tests/arm/Makefile.am
  41 +++ b/none/tests/arm/Makefile.am
  42 @@ -56,10 +56,10 @@ allexec_CFLAGS              = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
  43  # need special helping w.r.t -mfpu and -mfloat-abi, though.
  44  # Also force -O0 since -O takes hundreds of MB of memory
  45  # for v6intThumb.c.
  46 -v6intARM_CFLAGS   = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -marm
  47 -v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb
  48 +v6intARM_CFLAGS   = $(AM_CFLAGS) -g -O0 -marm
  49 +v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
  50
  51 -v6media_CFLAGS    = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb
  52 +v6media_CFLAGS    = $(AM_CFLAGS) -g -O0 -mthumb
  53
  54  v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a
  55  v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a
  56 @@ -74,23 +74,23 @@ v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \
  57
  58  vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mfpu=neon
  59
  60 -vfp_CFLAGS        = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  61 +vfp_CFLAGS        = $(AM_CFLAGS) -g -O0 \
  62                         -mfpu=neon \
  63                         -mthumb
  64
  65
  66 -neon128_CFLAGS    = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  67 +neon128_CFLAGS    = $(AM_CFLAGS) -g -O0 \
  68                         -mfpu=neon \
  69                         -mthumb
  70
  71 -neon64_CFLAGS     = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  72 +neon64_CFLAGS     = $(AM_CFLAGS) -g -O0 \
  73                         -mfpu=neon \
  74                         -mthumb
  75
  76  intdiv_CFLAGS    = $(AM_CFLAGS) -g -march=armv7ve -mcpu=cortex-a15 -mthumb
  77 -ldrt_CFLAGS      = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb
  78 -ldrt_arm_CFLAGS          = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm
  79 +ldrt_CFLAGS      = $(AM_CFLAGS) -g -mthumb
  80 +ldrt_arm_CFLAGS          = $(AM_CFLAGS) -g -marm
  81
  82 -vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3
  83 +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3
  84
  85  vfpv4_fma_CFLAGS  = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm