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