lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 257/277] perf python: Fix probing for some clang command line options
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    commit dd6e1fe91cdd52774ca642d1da75b58a86356b56 upstream.

    The clang compiler complains about some options even without a source
    file being available, while others require one, so use the simple
    tools/build/feature/test-hello.c file.

    Then check for the "is not supported" string in its output, in addition
    to the "unknown argument" already being looked for.

    This was noticed when building with clang-13 where -ffat-lto-objects
    isn't supported and since we were looking just for "unknown argument"
    and not providing a source code to clang, was mistakenly assumed as
    being available and not being filtered to set of command line options
    provided to clang, leading to a build failure.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Fangrui Song <maskray@google.com>
    Cc: Florian Fainelli <f.fainelli@gmail.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: John Keeping <john@metanate.com>
    Cc: Leo Yan <leo.yan@linaro.org>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Nathan Chancellor <nathan@kernel.org>
    Cc: Nick Desaulniers <ndesaulniers@google.com>
    Cc: Sedat Dilek <sedat.dilek@gmail.com>
    Link: http://lore.kernel.org/lkml/
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/util/setup.py | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/tools/perf/util/setup.py
    +++ b/tools/perf/util/setup.py
    @@ -1,12 +1,14 @@
    -from os import getenv
    +from os import getenv, path
    from subprocess import Popen, PIPE
    from re import sub

    cc = getenv("CC")
    cc_is_clang = b"clang version" in Popen([cc.split()[0], "-v"], stderr=PIPE).stderr.readline()
    +src_feature_tests = getenv('srctree') + '/tools/build/feature'

    def clang_has_option(option):
    - return [o for o in Popen([cc, option], stderr=PIPE).stderr.readlines() if b"unknown argument" in o] == [ ]
    + cc_output = Popen([cc, option, path.join(src_feature_tests, "test-hello.c") ], stderr=PIPE).stderr.readlines()
    + return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o))] == [ ]

    if cc_is_clang:
    from distutils.sysconfig import get_config_vars

    \
     
     \ /
      Last update: 2022-04-12 09:34    [W:2.415 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site