0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108
  1. From 715cf122388f3527afa5649cebf9f1522c240693 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. We can not assume that all arches armv7+ are cortex-a8 only
  7. it fails to build for rpi which is armv7ve based (cortex-a8) cpu
  8. implementation.
  9. Fixes
  10. | cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch
  11. Upstream-Status: Pending
  12. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  13. ---
  14. Makefile.all.am | 6 +++---
  15. helgrind/tests/Makefile.am | 6 +++---
  16. none/tests/arm/Makefile.am | 18 +++++++++---------
  17. 3 files changed, 15 insertions(+), 15 deletions(-)
  18. diff --git a/Makefile.all.am b/Makefile.all.am
  19. index 02059a3..c7c4700 100644
  20. --- a/Makefile.all.am
  21. +++ b/Makefile.all.am
  22. @@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g
  23. AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@
  24. AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \
  25. - $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
  26. + $(AM_CFLAGS_BASE) -marm
  27. AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \
  28. - -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE)
  29. + -marm $(AM_CFLAGS_PSO_BASE)
  30. AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \
  31. - -marm -mcpu=cortex-a8 -g
  32. + -marm -g
  33. AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@
  34. AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE)
  35. diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
  36. index df82169..07eb66a 100644
  37. --- a/helgrind/tests/Makefile.am
  38. +++ b/helgrind/tests/Makefile.am
  39. @@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
  40. endif
  41. if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
  42. -annotate_hbefore_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8
  43. -tc07_hbl1_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8
  44. -tc08_hbl2_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8
  45. +annotate_hbefore_CFLAGS = $(AM_CFLAGS)
  46. +tc07_hbl1_CFLAGS = $(AM_CFLAGS)
  47. +tc08_hbl2_CFLAGS = $(AM_CFLAGS)
  48. else
  49. annotate_hbefore_CFLAGS = $(AM_CFLAGS)
  50. tc07_hbl1_CFLAGS = $(AM_CFLAGS)
  51. diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
  52. index 024eb6d..ccecb90 100644
  53. --- a/none/tests/arm/Makefile.am
  54. +++ b/none/tests/arm/Makefile.am
  55. @@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
  56. # need special helping w.r.t -mfpu and -mfloat-abi, though.
  57. # Also force -O0 since -O takes hundreds of MB of memory
  58. # for v6intThumb.c.
  59. -v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -marm
  60. -v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb
  61. +v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm
  62. +v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
  63. -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb
  64. +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
  65. v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm
  66. v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb
  67. @@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \
  68. v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \
  69. -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb
  70. -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  71. +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \
  72. -mfpu=neon \
  73. -mthumb
  74. -neon128_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  75. +neon128_CFLAGS = $(AM_CFLAGS) -g -O0 \
  76. -mfpu=neon \
  77. -mthumb
  78. -neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  79. +neon64_CFLAGS = $(AM_CFLAGS) -g -O0 \
  80. -mfpu=neon \
  81. -mthumb
  82. intdiv_CFLAGS = $(AM_CFLAGS) -g -march=armv7ve -mcpu=cortex-a15 -mthumb
  83. -ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb
  84. -ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm
  85. +ldrt_CFLAGS = $(AM_CFLAGS) -g -mthumb
  86. +ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -marm
  87. -vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3
  88. +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3
  89. vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm
  90. --
  91. 2.12.2