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.
Showing the changes to scripts (2 of 3 files). Show all
Unified · Split
| @@ -27,4 +27,4 @@ cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null) · 26 unmodified lines | |||
| 27 | ld-option = $(success,$(LD) -v $(1)) | 27 | ld-option = $(success,$(LD) -v $(1)) |
| 28 | 28 | ||
| 29 | # gcc version including patch level | 29 | # gcc version including patch level |
| 30 | gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//') | 30 | gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh $(CC)) |
| @@ -1,33 +1,20 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # SPDX-License-Identifier: GPL-2.0 | 2 | # SPDX-License-Identifier: GPL-2.0 |
| 3 | # | 3 | # |
| 4 | # gcc-version [-p] gcc-command | 4 | # gcc-version gcc-command |
| 5 | # | ||
| 6 | # Prints the gcc version of `gcc-command' in a canonical 4-digit form | ||
| 7 | # such as `0295' for gcc-2.95, `0303' for gcc-3.3, etc. | ||
| 8 | # | ||
| 9 | # With the -p option, prints the patchlevel as well, for example `029503' for | ||
| 10 | # gcc-2.95.3, `030301' for gcc-3.3.1, etc. | ||
| 11 | # | 5 | # |
| 12 | 6 | # Print the gcc version of `gcc-command' in a 5 or 6-digit form | |
| 13 | if [ "$1" = "-p" ] ; then | 7 | # such as `29503' for gcc-2.95.3, `30301' for gcc-3.3.1, etc. |
| 14 | with_patchlevel=1; | ||
| 15 | shift; | ||
| 16 | fi | ||
| 17 | 8 | ||
| 18 | compiler="$*" | 9 | compiler="$*" |
| 19 | 10 | ||
| 20 | if [ ${#compiler} -eq 0 ]; then | 11 | if [ ${#compiler} -eq 0 ]; then |
| 21 | echo "Error: No compiler specified." | 12 | echo "Error: No compiler specified." >&2 |
| 22 | printf "Usage:\n\t$0 <gcc-command>\n" | 13 | printf "Usage:\n\t$0 <gcc-command>\n" >&2 |
| 23 | exit 1 | 14 | exit 1 |
| 24 | fi | 15 | fi |
| 25 | 16 | ||
| 26 | MAJOR=$(echo __GNUC__ | $compiler -E -x c - | tail -n 1) | 17 | MAJOR=$(echo __GNUC__ | $compiler -E -x c - | tail -n 1) |
| 27 | MINOR=$(echo __GNUC_MINOR__ | $compiler -E -x c - | tail -n 1) | 18 | MINOR=$(echo __GNUC_MINOR__ | $compiler -E -x c - | tail -n 1) |
| 28 | if [ "x$with_patchlevel" != "x" ] ; then | 19 | PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1) |
| 29 | PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1) | 20 | printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL |
| 30 | printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL | ||
| 31 | else | ||
| 32 | printf "%02d%02d\\n" $MAJOR $MINOR | ||
| 33 | fi | ||