Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa7295ab authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: clean up scripts/gcc-version.sh 



Now that the Kconfig is the only user of this script, we can drop
unneeded code.

Remove the -p option, and stop prepending the output with zero,
so that Kconfig can directly use the output from this script.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent d3a918c6

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config CC_IS_GCC 


config GCC_VERSION

	int

	default $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//') if CC_IS_GCC

	default $(shell,$(srctree)/scripts/gcc-version.sh $(CC)) if CC_IS_GCC

	default 0



config CC_IS_CLANG

scripts/Kconfig.include

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null) 
ld-option = $(success,$(LD) -v $(1))



# gcc version including patch level

gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//')
 
gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh $(CC))

scripts/gcc-version.sh

+7 −20
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

#

# gcc-version [-p] gcc-command

#

# Prints the gcc version of `gcc-command' in a canonical 4-digit form

# such as `0295' for gcc-2.95, `0303' for gcc-3.3, etc.

#

# With the -p option, prints the patchlevel as well, for example `029503' for

# gcc-2.95.3, `030301' for gcc-3.3.1, etc.

# gcc-version gcc-command

#



if [ "$1" = "-p" ] ; then

	with_patchlevel=1;

	shift;

fi

# Print the gcc version of `gcc-command' in a 5 or 6-digit form

# such as `29503' for gcc-2.95.3, `30301' for gcc-3.3.1, etc.



compiler="$*"



if [ ${#compiler} -eq 0 ]; then

	echo "Error: No compiler specified."

	printf "Usage:\n\t$0 <gcc-command>\n"

	echo "Error: No compiler specified." >&2

	printf "Usage:\n\t$0 <gcc-command>\n" >&2

	exit 1

fi



MAJOR=$(echo __GNUC__ | $compiler -E -x c - | tail -n 1)

MINOR=$(echo __GNUC_MINOR__ | $compiler -E -x c - | tail -n 1)

if [ "x$with_patchlevel" != "x" ] ; then

PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1)

	printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL

else

	printf "%02d%02d\\n" $MAJOR $MINOR

fi
 
printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL