change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/tools/objtool/Makefile
..
..
@@ -2,10 +2,6 @@
2
2
 include ../scripts/Makefile.include
3
3
 include ../scripts/Makefile.arch
4
4
 
5
-ifeq ($(ARCH),x86_64)
6
-ARCH := x86
7
-endif
8
-
9
5
 # always use the host compiler
10
6
 AR	 = $(HOSTAR)
11
7
 CC	 = $(HOSTCC)
..
..
@@ -30,8 +26,9 @@
30
26
 
31
27
 INCLUDES := -I$(srctree)/tools/include \
32
28
 	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
33
-	    -I$(srctree)/tools/objtool/arch/$(ARCH)/include
34
-WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
29
+	    -I$(srctree)/tools/arch/$(SRCARCH)/include	\
30
+	    -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include
31
+WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs
35
32
 CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
36
33
 LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
37
34
 
..
..
@@ -40,14 +37,24 @@
40
37
 CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
41
38
 
42
39
 AWK = awk
40
+
41
+SUBCMD_CHECK := n
42
+SUBCMD_ORC := n
43
+
44
+ifeq ($(SRCARCH),x86)
45
+	SUBCMD_CHECK := y
46
+	SUBCMD_ORC := y
47
+endif
48
+
49
+export SUBCMD_CHECK SUBCMD_ORC
43
50
 export srctree OUTPUT CFLAGS SRCARCH AWK
44
51
 include $(srctree)/tools/build/Makefile.include
45
52
 
46
53
 $(OBJTOOL_IN): fixdep FORCE
54
+	@$(CONFIG_SHELL) ./sync-check.sh
47
55
 	@$(MAKE) $(build)=objtool
48
56
 
49
57
 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
50
-	@$(CONFIG_SHELL) ./sync-check.sh
51
58
 	$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
52
59
 
53
60
 
..
..
@@ -57,7 +64,7 @@
57
64
 clean:
58
65
 	$(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)
59
66
 	$(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
60
-	$(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep
67
+	$(Q)$(RM) $(OUTPUT)arch/x86/inat-tables.c $(OUTPUT)fixdep
61
68
 
62
69
 FORCE:
63
70