Skip to content

Commit 18fe1f5

Browse files
rddunlaphansendc
authored andcommitted
x86/cpu: Drop unused Kconfig symbol X86_P6_NOP
This symbol was removed in early 2025 but 2 dangling references to it were missed. Delete them now. It should be safe to drop the -mtune=generic32 option since gcc 4.3 and later do not cause the problem (see 28f7e66 ("x86: prevent binutils from being "smart" and generating NOPLs for us")). Also, Arnd confirmed this with gcc-8 and gcc-15 (see Link:). Fixes: f388f60 ("x86/cpu: Drop configuration options for early 64-bit CPUs") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Nikolay Borisov <nik.borisov@suse.com> Link: https://patch.msgid.link/20260106014708.991447-1-rdunlap@infradead.org Link: https://lore.kernel.org/all/c0f0814a-8333-49e1-8e50-740e4c88d94b@app.fastmail.com/
1 parent 0bc0375 commit 18fe1f5

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

arch/x86/Kconfig.cpufeatures

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ config X86_REQUIRED_FEATURE_ALWAYS
3838

3939
config X86_REQUIRED_FEATURE_NOPL
4040
def_bool y
41-
depends on X86_64 || X86_P6_NOP
41+
depends on X86_64
4242

4343
config X86_REQUIRED_FEATURE_CX8
4444
def_bool y

arch/x86/Makefile_32.cpu

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,3 @@ cflags-$(CONFIG_MGEODE_LX) += $(call cc-option,-march=geode,-march=pentium-mmx)
4242
# add at the end to overwrite eventual tuning options from earlier
4343
# cpu entries
4444
cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686))
45-
46-
# Bug fix for binutils: this option is required in order to keep
47-
# binutils from generating NOPL instructions against our will.
48-
ifneq ($(CONFIG_X86_P6_NOP),y)
49-
cflags-y += $(call cc-option,-Wa$(comma)-mtune=generic32,)
50-
endif

0 commit comments

Comments
 (0)