mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
09e6f9f983
Noticed this build failure on archlinux:base when building with clang: clang-14: error: optimization flag '-ffat-lto-objects' is not supported [-Werror,-Wignored-optimization-argument] In tools/perf/util/setup.py we check if clang supports that option, but since commit3cad53a6f9("perf python: Account for multiple words in CC") this got broken as in the common case where CC="clang": >>> cc="clang" >>> print(cc.split()[0]) clang >>> option="-ffat-lto-objects" >>> print(str(cc.split()[1:]) + option) []-ffat-lto-objects >>> And then the Popen will call clang with that bogus option name that in turn will not produce the b"unknown argument" or b"is not supported" that this function uses to detect if the option is not available and thus later on clang will be called with an unknown/unsupported option. Fix it by looking if really there are options in the provided CC variable, and if so override 'cc' with the first token and append the options to the 'option' variable. Fixes:3cad53a6f9("perf python: Account for multiple words in CC") 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: Khem Raj <raj.khem@gmail.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/Y6Rq5F5NI0v1QQHM@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
107 lines
3.8 KiB
Python
107 lines
3.8 KiB
Python
from os import getenv, path
|
|
from subprocess import Popen, PIPE
|
|
from re import sub
|
|
|
|
cc = getenv("CC")
|
|
|
|
# Check if CC has options, as is the case in yocto, where it uses CC="cc --sysroot..."
|
|
cc_tokens = cc.split()
|
|
if len(cc_tokens) > 1:
|
|
cc = cc_tokens[0]
|
|
cc_options = " ".join([str(e) for e in cc_tokens[1:]]) + " "
|
|
else:
|
|
cc_options = ""
|
|
|
|
cc_is_clang = b"clang version" in Popen([cc, "-v"], stderr=PIPE).stderr.readline()
|
|
src_feature_tests = getenv('srctree') + '/tools/build/feature'
|
|
|
|
def clang_has_option(option):
|
|
cc_output = Popen([cc, cc_options + 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 sysconfig import get_config_vars
|
|
vars = get_config_vars()
|
|
for var in ('CFLAGS', 'OPT'):
|
|
vars[var] = sub("-specs=[^ ]+", "", vars[var])
|
|
if not clang_has_option("-mcet"):
|
|
vars[var] = sub("-mcet", "", vars[var])
|
|
if not clang_has_option("-fcf-protection"):
|
|
vars[var] = sub("-fcf-protection", "", vars[var])
|
|
if not clang_has_option("-fstack-clash-protection"):
|
|
vars[var] = sub("-fstack-clash-protection", "", vars[var])
|
|
if not clang_has_option("-fstack-protector-strong"):
|
|
vars[var] = sub("-fstack-protector-strong", "", vars[var])
|
|
if not clang_has_option("-fno-semantic-interposition"):
|
|
vars[var] = sub("-fno-semantic-interposition", "", vars[var])
|
|
if not clang_has_option("-ffat-lto-objects"):
|
|
vars[var] = sub("-ffat-lto-objects", "", vars[var])
|
|
|
|
from setuptools import setup, Extension
|
|
|
|
from setuptools.command.build_ext import build_ext as _build_ext
|
|
from setuptools.command.install_lib import install_lib as _install_lib
|
|
|
|
class build_ext(_build_ext):
|
|
def finalize_options(self):
|
|
_build_ext.finalize_options(self)
|
|
self.build_lib = build_lib
|
|
self.build_temp = build_tmp
|
|
|
|
class install_lib(_install_lib):
|
|
def finalize_options(self):
|
|
_install_lib.finalize_options(self)
|
|
self.build_dir = build_lib
|
|
|
|
|
|
cflags = getenv('CFLAGS', '').split()
|
|
# switch off several checks (need to be at the end of cflags list)
|
|
cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ]
|
|
if cc_is_clang:
|
|
cflags += ["-Wno-unused-command-line-argument" ]
|
|
else:
|
|
cflags += ['-Wno-cast-function-type' ]
|
|
|
|
src_perf = getenv('srctree') + '/tools/perf'
|
|
build_lib = getenv('PYTHON_EXTBUILD_LIB')
|
|
build_tmp = getenv('PYTHON_EXTBUILD_TMP')
|
|
libtraceevent = getenv('LIBTRACEEVENT')
|
|
libapikfs = getenv('LIBAPI')
|
|
libperf = getenv('LIBPERF')
|
|
|
|
ext_sources = [f.strip() for f in open('util/python-ext-sources')
|
|
if len(f.strip()) > 0 and f[0] != '#']
|
|
|
|
extra_libraries = []
|
|
|
|
if '-DHAVE_LIBTRACEEVENT' in cflags:
|
|
extra_libraries += [ 'traceevent' ]
|
|
else:
|
|
ext_sources.remove('util/trace-event.c')
|
|
|
|
# use full paths with source files
|
|
ext_sources = list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources))
|
|
|
|
if '-DHAVE_LIBNUMA_SUPPORT' in cflags:
|
|
extra_libraries += [ 'numa' ]
|
|
if '-DHAVE_LIBCAP_SUPPORT' in cflags:
|
|
extra_libraries += [ 'cap' ]
|
|
|
|
perf = Extension('perf',
|
|
sources = ext_sources,
|
|
include_dirs = ['util/include'],
|
|
libraries = extra_libraries,
|
|
extra_compile_args = cflags,
|
|
extra_objects = [ x for x in [libtraceevent, libapikfs, libperf]
|
|
if x is not None],
|
|
)
|
|
|
|
setup(name='perf',
|
|
version='0.1',
|
|
description='Interface with the Linux profiling infrastructure',
|
|
author='Arnaldo Carvalho de Melo',
|
|
author_email='acme@redhat.com',
|
|
license='GPLv2',
|
|
url='http://perf.wiki.kernel.org',
|
|
ext_modules=[perf],
|
|
cmdclass={'build_ext': build_ext, 'install_lib': install_lib})
|