Skip to content

Commit a517faa

Browse files
nickdesaulnierswilldeacon
authored andcommitted
arm64: vdso32: drop test for -march=armv8-a
As Arnd points out: gcc-4.8 already supported -march=armv8, and we require gcc-5.1 now, so both this #if/#else construct and the corresponding "cc32-option,-march=armv8-a" check should be obsolete now. Link: https://lore.kernel.org/lkml/CAK8P3a3UBEJ0Py2ycz=rHfgog8g3mCOeQOwO0Gmp-iz6Uxkapg@mail.gmail.com/ Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Nick Desaulniers <[email protected]> Reviewed-by: Vincenzo Frascino <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 1907d3f commit a517faa

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

arch/arm64/include/asm/vdso/compat_barrier.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,9 @@
2020

2121
#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
2222

23-
#if __LINUX_ARM_ARCH__ >= 8
2423
#define aarch32_smp_mb() dmb(ish)
2524
#define aarch32_smp_rmb() dmb(ishld)
2625
#define aarch32_smp_wmb() dmb(ishst)
27-
#else
28-
#define aarch32_smp_mb() dmb(ish)
29-
#define aarch32_smp_rmb() aarch32_smp_mb()
30-
#define aarch32_smp_wmb() dmb(ishst)
31-
#endif
32-
3326

3427
#undef smp_mb
3528
#undef smp_rmb

arch/arm64/kernel/vdso32/Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,7 @@ endif
6565
# From arm vDSO Makefile
6666
VDSO_CAFLAGS += -fPIC -fno-builtin -fno-stack-protector
6767
VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING
68-
69-
70-
# Try to compile for ARMv8. If the compiler is too old and doesn't support it,
71-
# fall back to v7. There is no easy way to check for what architecture the code
72-
# is being compiled, so define a macro specifying that (see arch/arm/Makefile).
73-
VDSO_CAFLAGS += $(call cc32-option,-march=armv8-a -D__LINUX_ARM_ARCH__=8,\
74-
-march=armv7-a -D__LINUX_ARM_ARCH__=7)
68+
VDSO_CAFLAGS += -march=armv8-a
7569

7670
VDSO_CFLAGS := $(VDSO_CAFLAGS)
7771
VDSO_CFLAGS += -DENABLE_COMPAT_VDSO=1

0 commit comments

Comments
 (0)