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
327327
328328 quiet_cmd_dtc = DTC $@
329329 cmd_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 \
331331 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
332332 -d $(depfile).dtc.tmp $(dtc-tmp) ; \
333333 cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
@@ -352,7 +352,7 @@ define rule_dtc · 18 unmodified lines
352352 endef
353353
354354 $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
355− $(call if_changed_rule,dtc,yaml)
355+ $(call if_changed_rule,dtc)
356356
357357 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
358358
scripts/dummy-tools/gcc+16−2
@@ -57,9 +57,9 @@ if arg_contain --version "$@"; then · 56 unmodified lines
5757 fi
5858
5959 if arg_contain -E "$@"; then
60− # For scripts/gcc-version.sh; This emulates GCC 20.0.0
60+ # For scripts/cc-version.sh; This emulates GCC 20.0.0
6161 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;}'
6363 exit 0
6464 else
6565 echo "no input files" >&2
@@ -73,6 +73,15 @@ if arg_contain -S "$@"; then · 7 unmodified lines
7373 echo "%gs"
7474 exit 0
7575 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
7685 fi
7786
7887 # To set GCC_PLUGINS
@@ -85,3 +94,8 @@ if arg_contain -print-file-name=plugin "$@"; then · 6 unmodified lines
8594 echo $plugin_dir
8695 exit 0
8796 fi
97+
98+# inverted return value
99+if arg_contain -D__SIZEOF_INT128__=0 "$@"; then
100+ exit 1
101+fi
scripts/gcc-plugins/Makefile+1−0
@@ -22,6 +22,7 @@ always-y += $(GCC_PLUGIN) · 21 unmodified lines
2222 GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
2323
2424 plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
25+ -include $(srctree)/include/linux/compiler-version.h \
2526 -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
2627 -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
2728 -ggdb -Wno-narrowing -Wno-unused-variable \
scripts/ld-version.sh+14−8
@@ -29,7 +29,7 @@ orig_args="$@" · 28 unmodified lines
2929 # Get the first line of the --version output.
3030 IFS='
3131 '
32−set -- $("$@" --version)
32+set -- $(LC_ALL=C "$@" --version)
3333
3434 # Split the line on spaces.
3535 IFS=' '
@@ -44,14 +44,20 @@ if [ "$1" = GNU -a "$2" = ld ]; then · 8 unmodified lines
4444 elif [ "$1" = GNU -a "$2" = gold ]; then
4545 echo "gold linker is not supported as it is not capable of linking the kernel proper." >&2
4646 exit 1
47−elif [ "$1" = LLD ]; then
48− version=$2
49− min_version=$lld_min_version
50− name=LLD
51− disp_name=LLD
5247 else
53− echo "$orig_args: unknown linker" >&2
54− exit 1
48+ while [ $# -gt 1 -a "$1" != "LLD" ]; do
49+ 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
5561 fi
5662
5763 # Some distributions append a package release number, as in 2.34-4.fc32