History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

David S. Miller committed 5 years ago

Commit efd13b72 parents 84c7f6c 00232241022 files · +8206 −4635Browse files

Showing the changes to scripts (4 of 1022 files). Show all

Unified · Split

4 files
  1. scripts/Makefile.lib +2 −2
  2. scripts/dummy-tools/gcc +16 −2
  3. scripts/gcc-plugins/Makefile +1 −0
  4. scripts/ld-version.sh +14 −8
scripts/Makefile.lib+2−2
@@ -327,7 +327,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE · 326 unmodified lines
327 327
328quiet_cmd_dtc = DTC $@328quiet_cmd_dtc = DTC $@
329cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \329cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
330 $(DTC) -O $(patsubst .%,%,$(suffix $@)) -o $@ -b 0 \330 $(DTC) -o $@ -b 0 \
331 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \331 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
332 -d $(depfile).dtc.tmp $(dtc-tmp) ; \332 -d $(depfile).dtc.tmp $(dtc-tmp) ; \
333 cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)333 cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
@@ -352,7 +352,7 @@ define rule_dtc · 18 unmodified lines
352endef352endef
353 353
354$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE354$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
355 $(call if_changed_rule,dtc,yaml)355 $(call if_changed_rule,dtc)
356 356
357dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)357dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
358 358
scripts/dummy-tools/gcc+16−2
@@ -57,9 +57,9 @@ if arg_contain --version "$@"; then · 56 unmodified lines
57fi57fi
58 58
59if arg_contain -E "$@"; then59if arg_contain -E "$@"; then
60 # For scripts/gcc-version.sh; This emulates GCC 20.0.060 # For scripts/cc-version.sh; This emulates GCC 20.0.0
61 if arg_contain - "$@"; then61 if arg_contain - "$@"; then
62 sed 's/^__GNUC__$/20/; s/^__GNUC_MINOR__$/0/; s/^__GNUC_PATCHLEVEL__$/0/'62 sed -n '/^GCC/{s/__GNUC__/20/; s/__GNUC_MINOR__/0/; s/__GNUC_PATCHLEVEL__/0/; p;}'
63 exit 063 exit 0
64 else64 else
65 echo "no input files" >&265 echo "no input files" >&2
@@ -73,6 +73,15 @@ if arg_contain -S "$@"; then · 7 unmodified lines
73 echo "%gs"73 echo "%gs"
74 exit 074 exit 0
75 fi75 fi
76
77 # For arch/powerpc/tools/gcc-check-mprofile-kernel.sh
78 if arg_contain -m64 "$@" && arg_contain -mlittle-endian "$@" &&
79 arg_contain -mprofile-kernel "$@"; then
80 if ! test -t 0 && ! grep -q notrace; then
81 echo "_mcount"
82 fi
83 exit 0
84 fi
76fi85fi
77 86
78# To set GCC_PLUGINS87# To set GCC_PLUGINS
@@ -85,3 +94,8 @@ if arg_contain -print-file-name=plugin "$@"; then · 6 unmodified lines
85 echo $plugin_dir94 echo $plugin_dir
86 exit 095 exit 0
87fi96fi
97
98# inverted return value
99if arg_contain -D__SIZEOF_INT128__=0 "$@"; then
100 exit 1
101fi
scripts/gcc-plugins/Makefile+1−0
@@ -22,6 +22,7 @@ always-y += $(GCC_PLUGIN) · 21 unmodified lines
22GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)22GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
23 23
24plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \24plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
25 -include $(srctree)/include/linux/compiler-version.h \
25 -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \26 -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
26 -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \27 -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
27 -ggdb -Wno-narrowing -Wno-unused-variable \28 -ggdb -Wno-narrowing -Wno-unused-variable \
scripts/ld-version.sh+14−8
@@ -29,7 +29,7 @@ orig_args="$@" · 28 unmodified lines
29# Get the first line of the --version output.29# Get the first line of the --version output.
30IFS='30IFS='
31'31'
32set -- $("$@" --version)32set -- $(LC_ALL=C "$@" --version)
33 33
34# Split the line on spaces.34# Split the line on spaces.
35IFS=' '35IFS=' '
@@ -44,14 +44,20 @@ if [ "$1" = GNU -a "$2" = ld ]; then · 8 unmodified lines
44elif [ "$1" = GNU -a "$2" = gold ]; then44elif [ "$1" = GNU -a "$2" = gold ]; then
45 echo "gold linker is not supported as it is not capable of linking the kernel proper." >&245 echo "gold linker is not supported as it is not capable of linking the kernel proper." >&2
46 exit 146 exit 1
47elif [ "$1" = LLD ]; then
48 version=$2
49 min_version=$lld_min_version
50 name=LLD
51 disp_name=LLD
52else47else
53 echo "$orig_args: unknown linker" >&248 while [ $# -gt 1 -a "$1" != "LLD" ]; do
54 exit 149 shift
50 done
51
52 if [ "$1" = LLD ]; then
53 version=$2
54 min_version=$lld_min_version
55 name=LLD
56 disp_name=LLD
57 else
58 echo "$orig_args: unknown linker" >&2
59 exit 1
60 fi
55fi61fi
56 62
57# Some distributions append a package release number, as in 2.34-4.fc3263# Some distributions append a package release number, as in 2.34-4.fc32