0023-libatomic-Do-not-enforce-march-on-aarch64.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. From 52931ec7a708b58d68e69ce9eb99001ae9f099dd Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Wed, 13 May 2020 15:10:38 -0700
  4. Subject: [PATCH] libatomic: Do not enforce march on aarch64
  5. OE passes the right options via gcc compiler cmdline via TUNE_CCARGS
  6. this can conflict between -mcpu settings and -march setting here, since
  7. -mcpu will translate into an appropriate -march, lets depend on that
  8. instead of setting it explicitly
  9. Upstream-Status: Inappropriate [OE-Specific]
  10. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  11. ---
  12. libatomic/Makefile.am | 1 -
  13. libatomic/Makefile.in | 1 -
  14. 2 files changed, 2 deletions(-)
  15. diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
  16. index d88515e4a03..e0e2f8b442a 100644
  17. --- a/libatomic/Makefile.am
  18. +++ b/libatomic/Makefile.am
  19. @@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
  20. ## On a target-specific basis, include alternates to be selected by IFUNC.
  21. if HAVE_IFUNC
  22. if ARCH_AARCH64_LINUX
  23. -IFUNC_OPTIONS = -march=armv8-a+lse
  24. libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)))
  25. endif
  26. if ARCH_ARM_LINUX
  27. diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
  28. index 80d25653dc7..7377689ab34 100644
  29. --- a/libatomic/Makefile.in
  30. +++ b/libatomic/Makefile.in
  31. @@ -434,7 +434,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
  32. libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
  33. _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \
  34. $(am__append_3) $(am__append_4)
  35. -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse
  36. @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64
  37. @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586
  38. @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 -mcx16