Commit 4d762034 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.13' of... 

Merge tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Fix short log indentation for tools builds

 - Fix dummy-tools to adjust to the latest stackprotector check

* tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: dummy-tools: adjust to stricter stackprotector check
  scripts/jobserver-exec: Fix a typo ("envirnoment")
  tools build: Fix quiet cmd indentation
parents 34c5c898 c93db682

scripts/dummy-tools/gcc

+5 −1
Original line number Diff line number Diff line
@@ -76,7 +76,11 @@ fi 
if arg_contain -S "$@"; then

	# For scripts/gcc-x86-*-has-stack-protector.sh

	if arg_contain -fstack-protector "$@"; then

		if arg_contain -mstack-protector-guard-reg=fs "$@"; then

			echo "%fs"

		else

			echo "%gs"

		fi

		exit 0

	fi

scripts/jobserver-exec

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ from __future__ import print_function 
import os, sys, errno

import subprocess



# Extract and prepare jobserver file descriptors from envirnoment.

# Extract and prepare jobserver file descriptors from environment.

claim = 0

jobs = b""

try:

tools/scripts/Makefile.include

+15 −15
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ ifneq ($(silent),1) 
			 $(MAKE) $(PRINT_DIR) -C $$subdir

	QUIET_FLEX     = @echo '  FLEX    '$@;

	QUIET_BISON    = @echo '  BISON   '$@;

	QUIET_GENSKEL  = @echo '  GEN-SKEL '$@;

	QUIET_GENSKEL  = @echo '  GENSKEL '$@;



	descend = \

		+@echo	       '  DESCEND '$(1); \

tools/build/Makefile.build

+11 −11

File changed.

Contains only whitespace changes.