lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 25/31] kconfig: add CC_IS_CLANG and CLANG_VERSION
    Date
    This will be useful to describe the clang version dependency.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    ---

    Changes in v5: None
    Changes in v4: None
    Changes in v3: None
    Changes in v2: None

    init/Kconfig | 7 +++++++
    scripts/clang-version.sh | 18 ++++--------------
    2 files changed, 11 insertions(+), 14 deletions(-)

    diff --git a/init/Kconfig b/init/Kconfig
    index 2e33d93..22e095d 100644
    --- a/init/Kconfig
    +++ b/init/Kconfig
    @@ -16,6 +16,13 @@ config GCC_VERSION
    default $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//') if CC_IS_GCC
    default 0

    +config CC_IS_CLANG
    + def_bool $(success,$(CC) --version | grep -q clang)
    +
    +config CLANG_VERSION
    + int
    + default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
    +
    config CONSTRUCTORS
    bool
    depends on !UML
    diff --git a/scripts/clang-version.sh b/scripts/clang-version.sh
    index 9780efa..dbf0a31 100755
    --- a/scripts/clang-version.sh
    +++ b/scripts/clang-version.sh
    @@ -10,24 +10,14 @@
    # clang-5.0.1 etc.
    #

    -if [ "$1" = "-p" ] ; then
    - with_patchlevel=1;
    - shift;
    -fi
    -
    compiler="$*"

    -if [ ${#compiler} -eq 0 ]; then
    - echo "Error: No compiler specified."
    - printf "Usage:\n\t$0 <clang-command>\n"
    +if !( $compiler --version | grep -q clang) ; then
    + echo 0
    exit 1
    fi

    MAJOR=$(echo __clang_major__ | $compiler -E -x c - | tail -n 1)
    MINOR=$(echo __clang_minor__ | $compiler -E -x c - | tail -n 1)
    -if [ "x$with_patchlevel" != "x" ] ; then
    - PATCHLEVEL=$(echo __clang_patchlevel__ | $compiler -E -x c - | tail -n 1)
    - printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
    -else
    - printf "%02d%02d\\n" $MAJOR $MINOR
    -fi
    +PATCHLEVEL=$(echo __clang_patchlevel__ | $compiler -E -x c - | tail -n 1)
    +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-05-28 11:27    [W:4.383 / U:0.708 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site