Skip to content

Commit ff9a793

Browse files
torvaldstorvalds
committed
Merge tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada: - Avoid 'constexpr', which is a keyword in C23 - Allow 'dtbs_check' and 'dt_compatible_check' run independently of 'dt_binding_check' - Fix weak references to avoid GOT entries in position-independent code generation - Convert the last use of 'optional' property in arch/sh/Kconfig - Remove support for the 'optional' property in Kconfig - Remove support for Clang's ThinLTO caching, which does not work with the .incbin directive - Change the semantics of $(src) so it always points to the source directory, which fixes Makefile inconsistencies between upstream and downstream - Fix 'make tar-pkg' for RISC-V to produce a consistent package - Provide reasonable default coverage for objtool, sanitizers, and profilers - Remove redundant OBJECT_FILES_NON_STANDARD, KASAN_SANITIZE, etc. - Remove the last use of tristate choice in drivers/rapidio/Kconfig - Various cleanups and fixes in Kconfig * tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (46 commits) kconfig: use sym_get_choice_menu() in sym_check_prop() rapidio: remove choice for enumeration kconfig: lxdialog: remove initialization with A_NORMAL kconfig: m/nconf: merge two item_add_str() calls kconfig: m/nconf: remove dead code to display value of bool choice kconfig: m/nconf: remove dead code to display children of choice members kconfig: gconf: show checkbox for choice correctly kbuild: use GCOV_PROFILE and KCSAN_SANITIZE in scripts/Makefile.modfinal Makefile: remove redundant tool coverage variables kbuild: provide reasonable defaults for tool coverage modules: Drop the .export_symbol section from the final modules kconfig: use menu_list_for_each_sym() in sym_check_choice_deps() kconfig: use sym_get_choice_menu() in conf_write_defconfig() kconfig: add sym_get_choice_menu() helper kconfig: turn defaults and additional prompt for choice members into error kconfig: turn missing prompt for choice members into error kconfig: turn conf_choice() into void function kconfig: use linked list in sym_set_changed() kconfig: gconf: use MENU_CHANGED instead of SYMBOL_CHANGED kconfig: gconf: remove debug code ...
2 parents 0cc6f45 + 6ffe4fd commit ff9a793

File tree

177 files changed

+611
-946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+611
-946
lines changed

‎Documentation/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,22 @@ loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit;
8080
# * dest folder relative to $(BUILDDIR) and
8181
# * cache folder relative to $(BUILDDIR)/.doctrees
8282
# $4 dest subfolder e.g. "man" for man pages at userspace-api/media/man
83-
# $5 reST source folder relative to $(srctree)/$(src),
83+
# $5 reST source folder relative to $(src),
8484
# e.g. "userspace-api/media" for the linux-tv book-set at ./Documentation/userspace-api/media
8585

8686
quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
8787
cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media $2 && \
8888
PYTHONDONTWRITEBYTECODE=1 \
89-
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
89+
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(src)/$5/$(SPHINX_CONF)) \
9090
$(PYTHON3) $(srctree)/scripts/jobserver-exec \
9191
$(CONFIG_SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
9292
$(SPHINXBUILD) \
9393
-b $2 \
94-
-c $(abspath $(srctree)/$(src)) \
94+
-c $(abspath $(src)) \
9595
-d $(abspath $(BUILDDIR)/.doctrees/$3) \
9696
-D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) \
9797
$(ALLSPHINXOPTS) \
98-
$(abspath $(srctree)/$(src)/$5) \
98+
$(abspath $(src)/$5) \
9999
$(abspath $(BUILDDIR)/$3/$4) && \
100100
if [ "x$(DOCS_CSS)" != "x" ]; then \
101101
cp $(if $(patsubst /%,,$(DOCS_CSS)),$(abspath $(srctree)/$(DOCS_CSS)),$(DOCS_CSS)) $(BUILDDIR)/$3/_static/; \

‎Documentation/devicetree/bindings/Makefile

+21-15
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,32 @@ quiet_cmd_extract_ex = DTEX $@
2525
$(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
2626
$(call if_changed,extract_ex)
2727

28-
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
28+
find_all_cmd = find $(src) \( -name '*.yaml' ! \
2929
-name 'processed-schema*' \)
3030

3131
find_cmd = $(find_all_cmd) | \
3232
sed 's|^$(srctree)/||' | \
3333
grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | \
3434
sed 's|^|$(srctree)/|'
35-
CHK_DT_DOCS := $(shell $(find_cmd))
35+
CHK_DT_EXAMPLES := $(patsubst $(srctree)/%.yaml,%.example.dtb, $(shell $(find_cmd)))
3636

3737
quiet_cmd_yamllint = LINT $(src)
3838
cmd_yamllint = ($(find_cmd) | \
3939
xargs -n200 -P$$(nproc) \
40-
$(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint >&2) || true
40+
$(DT_SCHEMA_LINT) -f parsable -c $(src)/.yamllint >&2) \
41+
&& touch $@ || true
4142

42-
quiet_cmd_chk_bindings = CHKDT $@
43+
quiet_cmd_chk_bindings = CHKDT $(src)
4344
cmd_chk_bindings = ($(find_cmd) | \
44-
xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)) || true
45+
xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(src)) \
46+
&& touch $@ || true
4547

4648
quiet_cmd_mk_schema = SCHEMA $@
4749
cmd_mk_schema = f=$$(mktemp) ; \
4850
$(find_all_cmd) > $$f ; \
4951
$(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \
5052
rm -f $$f
5153

52-
define rule_chkdt
53-
$(if $(DT_SCHEMA_LINT),$(call cmd,yamllint),)
54-
$(call cmd,chk_bindings)
55-
$(call cmd,mk_schema)
56-
endef
57-
5854
DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd)))
5955

6056
override DTC_FLAGS := \
@@ -64,12 +60,19 @@ override DTC_FLAGS := \
6460
-Wno-unique_unit_address \
6561
-Wunique_unit_address_if_enabled
6662

67-
$(obj)/processed-schema.json: $(DT_DOCS) $(src)/.yamllint check_dtschema_version FORCE
68-
$(call if_changed_rule,chkdt)
63+
$(obj)/processed-schema.json: $(DT_DOCS) check_dtschema_version FORCE
64+
$(call if_changed,mk_schema)
65+
66+
targets += .dt-binding.checked .yamllint.checked
67+
$(obj)/.yamllint.checked: $(DT_DOCS) $(src)/.yamllint FORCE
68+
$(if $(DT_SCHEMA_LINT),$(call if_changed,yamllint),)
69+
70+
$(obj)/.dt-binding.checked: $(DT_DOCS) FORCE
71+
$(call if_changed,chk_bindings)
6972

7073
always-y += processed-schema.json
71-
always-$(CHECK_DT_BINDING) += $(patsubst $(srctree)/$(src)/%.yaml,%.example.dts, $(CHK_DT_DOCS))
72-
always-$(CHECK_DT_BINDING) += $(patsubst $(srctree)/$(src)/%.yaml,%.example.dtb, $(CHK_DT_DOCS))
74+
targets += $(patsubst $(obj)/%,%, $(CHK_DT_EXAMPLES))
75+
targets += $(patsubst $(obj)/%.dtb,%.dts, $(CHK_DT_EXAMPLES))
7376

7477
# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of
7578
# build artifacts here before they are processed by scripts/Makefile.clean
@@ -78,3 +81,6 @@ clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \
7881

7982
dt_compatible_check: $(obj)/processed-schema.json
8083
$(Q)$(srctree)/scripts/dtc/dt-extract-compatibles $(srctree) | xargs dt-check-compatible -v -s $<
84+
85+
PHONY += dt_binding_check
86+
dt_binding_check: $(obj)/.dt-binding.checked $(obj)/.yamllint.checked $(CHK_DT_EXAMPLES)

‎Documentation/kbuild/kconfig-language.rst

-3
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,6 @@ to be set to 'm'. This can be used if multiple drivers for a single
410410
hardware exists and only a single driver can be compiled/loaded into
411411
the kernel, but all drivers can be compiled as modules.
412412

413-
A choice accepts another option "optional", which allows to set the
414-
choice to 'n' and no entry needs to be selected.
415-
416413
comment::
417414

418415
"comment" <prompt>

‎Documentation/kbuild/makefiles.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ ccflags-y, asflags-y and ldflags-y
346346
Example::
347347

348348
#arch/cris/boot/compressed/Makefile
349-
ldflags-y += -T $(srctree)/$(src)/decompress_$(arch-y).lds
349+
ldflags-y += -T $(src)/decompress_$(arch-y).lds
350350

351351
subdir-ccflags-y, subdir-asflags-y
352352
The two flags listed above are similar to ccflags-y and asflags-y.
@@ -426,14 +426,14 @@ path to prerequisite files and target files.
426426
Two variables are used when defining custom rules:
427427

428428
$(src)
429-
$(src) is a relative path which points to the directory
430-
where the Makefile is located. Always use $(src) when
429+
$(src) is the directory where the Makefile is located. Always use $(src) when
431430
referring to files located in the src tree.
432431

433432
$(obj)
434-
$(obj) is a relative path which points to the directory
435-
where the target is saved. Always use $(obj) when
436-
referring to generated files.
433+
$(obj) is the directory where the target is saved. Always use $(obj) when
434+
referring to generated files. Use $(obj) for pattern rules that need to work
435+
for both generated files and real sources (VPATH will help to find the
436+
prerequisites not only in the object tree but also in the source tree).
437437

438438
Example::
439439

‎Makefile

+27-17
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,14 @@ srctree := $(abs_srctree)
263263
endif
264264

265265
objtree := .
266+
267+
VPATH :=
268+
269+
ifeq ($(KBUILD_EXTMOD),)
270+
ifdef building_out_of_srctree
266271
VPATH := $(srctree)
272+
endif
273+
endif
267274

268275
export building_out_of_srctree srctree objtree VPATH
269276

@@ -942,7 +949,6 @@ endif
942949
ifdef CONFIG_LTO_CLANG
943950
ifdef CONFIG_LTO_CLANG_THIN
944951
CC_FLAGS_LTO := -flto=thin -fsplit-lto-unit
945-
KBUILD_LDFLAGS += --thinlto-cache-dir=$(extmod_prefix).thinlto-cache
946952
else
947953
CC_FLAGS_LTO := -flto
948954
endif
@@ -1248,8 +1254,8 @@ define filechk_version.h
12481254
echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
12491255
endef
12501256

1251-
$(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)
1252-
$(version_h): SUBLEVEL := $(or $(SUBLEVEL), 0)
1257+
$(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
1258+
$(version_h): private SUBLEVEL := $(or $(SUBLEVEL), 0)
12531259
$(version_h): FORCE
12541260
$(call filechk,version.h)
12551261

@@ -1403,7 +1409,7 @@ export CHECK_DTBS=y
14031409
endif
14041410

14051411
ifneq ($(CHECK_DTBS),)
1406-
dtbs_prepare: dt_binding_check
1412+
dtbs_prepare: dt_binding_schemas
14071413
endif
14081414

14091415
dtbs_check: dtbs
@@ -1422,15 +1428,18 @@ scripts_dtc: scripts_basic
14221428
$(Q)$(MAKE) $(build)=scripts/dtc
14231429

14241430
ifneq ($(filter dt_binding_check, $(MAKECMDGOALS)),)
1425-
export CHECK_DT_BINDING=y
1431+
export CHECK_DTBS=y
14261432
endif
14271433

1428-
PHONY += dt_binding_check
1429-
dt_binding_check: scripts_dtc
1434+
PHONY += dt_binding_check dt_binding_schemas
1435+
dt_binding_check: dt_binding_schemas scripts_dtc
1436+
$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings $@
1437+
1438+
dt_binding_schemas:
14301439
$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
14311440

14321441
PHONY += dt_compatible_check
1433-
dt_compatible_check: dt_binding_check
1442+
dt_compatible_check: dt_binding_schemas
14341443
$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings $@
14351444

14361445
# ---------------------------------------------------------------------------
@@ -1477,7 +1486,7 @@ endif # CONFIG_MODULES
14771486
# Directories & files removed with 'make clean'
14781487
CLEAN_FILES += vmlinux.symvers modules-only.symvers \
14791488
modules.builtin modules.builtin.modinfo modules.nsdeps \
1480-
compile_commands.json .thinlto-cache rust/test \
1489+
compile_commands.json rust/test \
14811490
rust-project.json .vmlinux.objs .vmlinux.export.c
14821491

14831492
# Directories & files removed with 'make mrproper'
@@ -1494,7 +1503,7 @@ MRPROPER_FILES += include/config include/generated \
14941503

14951504
# clean - Delete most, but leave enough to build external modules
14961505
#
1497-
clean: rm-files := $(CLEAN_FILES)
1506+
clean: private rm-files := $(CLEAN_FILES)
14981507

14991508
PHONY += archclean vmlinuxclean
15001509

@@ -1506,7 +1515,7 @@ clean: archclean vmlinuxclean resolve_btfids_clean
15061515

15071516
# mrproper - Delete all generated files, including .config
15081517
#
1509-
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
1518+
mrproper: private rm-files := $(MRPROPER_FILES)
15101519
mrproper-dirs := $(addprefix _mrproper_,scripts)
15111520

15121521
PHONY += $(mrproper-dirs) mrproper
@@ -1626,10 +1635,11 @@ help:
16261635
@echo ''
16271636
@$(if $(dtstree), \
16281637
echo 'Devicetree:'; \
1629-
echo '* dtbs - Build device tree blobs for enabled boards'; \
1630-
echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)'; \
1631-
echo ' dt_binding_check - Validate device tree binding documents'; \
1632-
echo ' dtbs_check - Validate device tree source files';\
1638+
echo '* dtbs - Build device tree blobs for enabled boards'; \
1639+
echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)'; \
1640+
echo ' dt_binding_check - Validate device tree binding documents and examples'; \
1641+
echo ' dt_binding_schema - Build processed device tree binding schemas'; \
1642+
echo ' dtbs_check - Validate device tree source files';\
16331643
echo '')
16341644

16351645
@echo 'Userspace tools targets:'
@@ -1782,8 +1792,8 @@ compile_commands.json: $(extmod_prefix)compile_commands.json
17821792
PHONY += compile_commands.json
17831793

17841794
clean-dirs := $(KBUILD_EXTMOD)
1785-
clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \
1786-
$(KBUILD_EXTMOD)/compile_commands.json $(KBUILD_EXTMOD)/.thinlto-cache
1795+
clean: private rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \
1796+
$(KBUILD_EXTMOD)/compile_commands.json
17871797

17881798
PHONY += prepare
17891799
# now expand this into a simple variable to reduce the cost of shell evaluations

‎arch/arc/boot/dts/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ obj-y += $(builtindtb-y).dtb.o
1010
dtb-y := $(builtindtb-y).dtb
1111

1212
# for CONFIG_OF_ALL_DTBS test
13-
dtstree := $(srctree)/$(src)
14-
dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
13+
dtb- := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))
1514

1615
# board-specific dtc flags
1716
DTC_FLAGS_hsdk += --pad 20

‎arch/arm/Kbuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
obj-$(CONFIG_FPE_NWFPE) += nwfpe/
33
# Put arch/arm/fastfpe/ to use this.
4-
obj-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/fastfpe/))
4+
obj-$(CONFIG_FPE_FASTFPE) += $(patsubst $(src)/%,%,$(wildcard $(src)/fastfpe/))
55
obj-$(CONFIG_VFP) += vfp/
66
obj-$(CONFIG_XEN) += xen/
77
obj-$(CONFIG_VDSO) += vdso/

‎arch/arm/boot/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ targets := Image zImage xipImage bootpImage uImage
2525

2626
ifeq ($(CONFIG_XIP_KERNEL),y)
2727

28-
cmd_deflate_xip_data = $(CONFIG_SHELL) -c \
29-
'$(srctree)/$(src)/deflate_xip_data.sh $< $@'
28+
cmd_deflate_xip_data = $(CONFIG_SHELL) -c '$(src)/deflate_xip_data.sh $< $@'
3029

3130
ifeq ($(CONFIG_XIP_DEFLATED_DATA),y)
3231
quiet_cmd_mkxip = XIPZ $@

‎arch/arm/boot/bootp/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# This file is included by the global makefile so that you can add your own
66
# architecture-specific flags and dependencies.
77
#
8-
GCOV_PROFILE := n
98

109
ifdef PHYS_OFFSET
1110
add_hex = $(shell printf 0x%x $$(( $(1) + $(2) )) )

‎arch/arm/boot/compressed/Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ ifeq ($(CONFIG_ARM_VIRT_EXT),y)
2222
OBJS += hyp-stub.o
2323
endif
2424

25-
GCOV_PROFILE := n
26-
KASAN_SANITIZE := n
27-
28-
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
29-
KCOV_INSTRUMENT := n
30-
UBSAN_SANITIZE := n
31-
3225
#
3326
# Architecture dependencies
3427
#

‎arch/arm/mach-s3c/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright 2009 Simtec Electronics
44

5-
include $(srctree)/$(src)/Makefile.s3c64xx
5+
include $(src)/Makefile.s3c64xx
66

77
# Objects we always build independent of SoC choice
88

‎arch/arm/plat-orion/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the linux kernel.
44
#
5-
ccflags-y := -I$(srctree)/$(src)/include
5+
ccflags-y := -I$(src)/include
66

77
orion-gpio-$(CONFIG_GPIOLIB) += gpio.o
88
obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o

‎arch/arm/tools/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gen := arch/$(ARCH)/include/generated
99
kapi := $(gen)/asm
1010
uapi := $(gen)/uapi/asm
1111
syshdr := $(srctree)/scripts/syscallhdr.sh
12-
sysnr := $(srctree)/$(src)/syscallnr.sh
12+
sysnr := $(src)/syscallnr.sh
1313
systbl := $(srctree)/scripts/syscalltbl.sh
1414
syscall := $(src)/syscall.tbl
1515

‎arch/arm/vdso/Makefile

-9
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ else
3333
CFLAGS_vgettimeofday.o = -O2 -include $(c-gettimeofday-y)
3434
endif
3535

36-
# Disable gcov profiling for VDSO code
37-
GCOV_PROFILE := n
38-
UBSAN_SANITIZE := n
39-
40-
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
41-
KCOV_INSTRUMENT := n
42-
43-
KASAN_SANITIZE := n
44-
4536
# Force dependency
4637
$(obj)/vdso.o : $(obj)/vdso.so
4738

‎arch/arm64/kernel/pi/Makefile

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))
1919
# disable LTO
2020
KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS))
2121

22-
GCOV_PROFILE := n
23-
KASAN_SANITIZE := n
24-
KCSAN_SANITIZE := n
25-
UBSAN_SANITIZE := n
26-
KCOV_INSTRUMENT := n
27-
2822
hostprogs := relacheck
2923

3024
quiet_cmd_piobjcopy = $(quiet_cmd_objcopy)

‎arch/arm64/kernel/vdso/Makefile

+1-9
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,13 @@ CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) \
4040
$(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) \
4141
$(CC_FLAGS_LTO) $(CC_FLAGS_CFI) \
4242
-Wmissing-prototypes -Wmissing-declarations
43-
KASAN_SANITIZE := n
44-
KCSAN_SANITIZE := n
45-
UBSAN_SANITIZE := n
46-
OBJECT_FILES_NON_STANDARD := y
47-
KCOV_INSTRUMENT := n
4843

4944
CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables
5045

5146
ifneq ($(c-gettimeofday-y),)
5247
CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)
5348
endif
5449

55-
# Disable gcov profiling for VDSO code
56-
GCOV_PROFILE := n
57-
5850
targets += vdso.lds
5951
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
6052

@@ -68,7 +60,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
6860
$(call if_changed,objcopy)
6961

7062
# Generate VDSO offsets using helper script
71-
gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh
63+
gen-vdsosym := $(src)/gen_vdso_offsets.sh
7264
quiet_cmd_vdsosym = VDSOSYM $@
7365
cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@
7466

0 commit comments

Comments
 (0)