| Message ID | 20250520-clang-toolchain-v2-1-db97c2eb3756@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | clang: Add clang C/C++ toolchain | expand |
On Tue, 2025-05-20 at 23:19 -0700, Khem Raj via lists.openembedded.org wrote: > This implements a toolchain selection mechanism with existing defaults > unchanged. > > It introduces a variable called TOOLCHAIN, which denotes the familiar > name for toolchain e.g. "gcc" which selects GNU compiler + binutils > as default C/C++ toolchain or "clang" which will use LLVM/Clang Compiler > > Additionally build-gcc is used for selecting native compiler > > TOOLCHAIN variable has a global fallback to "gcc" in configuration > metadata. A distro can switch to using say "clang" as default system > compiler by defining > > TOOLCHAIN ?= "clang" > > In local.conf or other distro specific global configuration metadata > > It is also selectable at recipe scope, since not all packages are > buildable with either clang or gcc, a recipe can explicitly demand > a given toolchain e.g. glibc can not be built with clang therefore > glibc recipe sets. > > TOOLCHAIN = "gcc" > > TCOVERRIDE is defined to toolchain-TOOLCHAIN and its added to OVERRIDES > that a recipe can see and it can use "toolchain-gcc" or "toolchain-clang" > to set specific metadata based upon global toolchain policy in distro. > > toolchain: Use TOOLCHAIN_NATIVE for defining native compiler > > This helps in selecting gcc or clang for native compiler irrespective > of cross-compiler selection via TOOLCHAIN variable > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/classes-global/base.bbclass | 5 ++++ > meta/classes-recipe/cross-canadian.bbclass | 2 ++ > meta/classes-recipe/cross.bbclass | 2 ++ > meta/classes-recipe/crosssdk.bbclass | 2 ++ > meta/classes-recipe/native.bbclass | 2 ++ > meta/classes-recipe/nativesdk.bbclass | 2 ++ > meta/classes/clang-native.bbclass | 28 ++++++++++++++++++++++ > .../toolchain/clang.inc => classes/clang.bbclass} | 10 ++++---- > .../build-gcc.inc => classes/gcc-native.bbclass} | 1 - > .../toolchain/gcc.inc => classes/gcc.bbclass} | 1 + > meta/conf/bitbake.conf | 7 +++--- > 11 files changed, 53 insertions(+), 9 deletions(-) This is definitely getting there, thanks for working through it. I think we're ready to agree that we should support toolchain selection with the TOOLCHAIN variable and we should support toolchain overrides. There are therefore some patches in this series which can merge as we agree on that. One of the concerns I have left is the class naming as I think "gcc.bbclass" is confusing in its own right. I'm wondering if we put these classes into a toolchain directory to make it clearer. I do also conceptually prefer the idea of an inc file so I'm wondering if we should see if some kind of require_defer syntax could work? > diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass > index 8215969c7bb37c1a1b91e260cd31714fee2db87c..ab2f0686b7b09e004ba8d5bb609e81b19da67e38 100644 > --- a/meta/classes-global/base.bbclass > +++ b/meta/classes-global/base.bbclass > @@ -6,6 +6,7 @@ > > BB_DEFAULT_TASK ?= "build" > CLASSOVERRIDE ?= "class-target" > +TCOVERRIDE ?= "toolchain-gcc" > > inherit patch > inherit staging > @@ -19,6 +20,10 @@ PACKAGECONFIG_CONFARGS ??= "" > > inherit metadata_scm > > +inherit gcc-native > +inherit gcc > +inherit_defer ${@oe.utils.ifelse(d.getVar('TOOLCHAIN') == 'clang', 'clang', '')} I'm a bit puzzled on why we can't defer the gcc inherit here too? I guess that didn't work for some reason? > + > def lsb_distro_identifier(d): > adjust = d.getVar('LSB_DISTRO_ADJUST') > adjust_func = None > diff --git a/meta/classes-recipe/cross-canadian.bbclass b/meta/classes-recipe/cross-canadian.bbclass > index 059d9aa95f57dd77a0ab5172c4c15c13ed3bc43e..a9dc6aa9bac7d5cc27331a505ed213aa9d402d4d 100644 > --- a/meta/classes-recipe/cross-canadian.bbclass > +++ b/meta/classes-recipe/cross-canadian.bbclass > @@ -14,6 +14,8 @@ > EXCLUDE_FROM_WORLD = "1" > NATIVESDKLIBC ?= "libc-glibc" > LIBCOVERRIDE = ":${NATIVESDKLIBC}" > +TCOVERRIDE = "" > +TOOLCHAIN = "" > CLASSOVERRIDE = "class-cross-canadian" > STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" > > diff --git a/meta/classes-recipe/cross.bbclass b/meta/classes-recipe/cross.bbclass > index 93de9a527446554b93c1e323c7458cc7aacef799..7ebf37760ca1fcad8cd1a2ee41ef32a29cca9b92 100644 > --- a/meta/classes-recipe/cross.bbclass > +++ b/meta/classes-recipe/cross.bbclass > @@ -10,6 +10,8 @@ inherit relocatable > # no need for them to be a direct target of 'world' > EXCLUDE_FROM_WORLD = "1" > > +TCOVERRIDE = "" > +TOOLCHAIN = "" > CLASSOVERRIDE = "class-cross" > PACKAGES = "" > PACKAGES_DYNAMIC = "" Wouldn't the recipes that include this class set TOOLCHAIN correctly anyway? > diff --git a/meta/classes-recipe/crosssdk.bbclass b/meta/classes-recipe/crosssdk.bbclass > index 824b1bcff47bcd36a70aa1d7b8724b6cf07131ff..0c0144b26829d3b76d034a89133ee94cf760b86d 100644 > --- a/meta/classes-recipe/crosssdk.bbclass > +++ b/meta/classes-recipe/crosssdk.bbclass > @@ -7,6 +7,8 @@ > inherit cross > > CLASSOVERRIDE = "class-crosssdk" > +TCOVERRIDE = "" > +TOOLCHAIN = "" > NATIVESDKLIBC ?= "libc-glibc" > LIBCOVERRIDE = ":${NATIVESDKLIBC}" > MACHINEOVERRIDES = "" Same question here. > diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass > index 625975a69429389a5b231a19b17e8ed7a12d80ad..cbdace9b7021e90a4df2684d9eacda36112b46c6 100644 > --- a/meta/classes-recipe/native.bbclass > +++ b/meta/classes-recipe/native.bbclass > @@ -108,6 +108,8 @@ PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" > > # we dont want libc-*libc to kick in for native recipes > LIBCOVERRIDE = "" > +TCOVERRIDE = "" > +TOOLCHAIN = "" > CLASSOVERRIDE = "class-native" > MACHINEOVERRIDES = "" > MACHINE_FEATURES = "" This, I can understand although I know there was "clang-native" support in places. I guess that is deferred for now? > diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass > index 7ecb4c12c1f0f2b9cc48da215006a153679facf8..440bc3a5c5434152dfe5c9c19db1c2be857cd794 100644 > --- a/meta/classes-recipe/nativesdk.bbclass > +++ b/meta/classes-recipe/nativesdk.bbclass > @@ -13,6 +13,8 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S > # libc for the SDK can be different to that of the target > NATIVESDKLIBC ?= "libc-glibc" > LIBCOVERRIDE = ":${NATIVESDKLIBC}" > +TCOVERRIDE = "" > +TOOLCHAIN = "" > CLASSOVERRIDE = "class-nativesdk" > MACHINEOVERRIDES = "" Do you have any plans to support building the SDK with clang? I'm just wondering on the code direction here in the future. > diff --git a/meta/classes/clang-native.bbclass b/meta/classes/clang-native.bbclass > new file mode 100644 > index 0000000000000000000000000000000000000000..bf395eade73eaad18bf15f35d03bc0aec2223090 > --- /dev/null > +++ b/meta/classes/clang-native.bbclass > @@ -0,0 +1,28 @@ > +# inherit this class if you would like to use clang to compile the native > +# version of your recipes instead of system compiler ( which is normally gcc ) > +# on build machines > +# to use it add > +# > +# inherit clang-native > +# > +# to the concerned recipe via a bbappend or directly to recipe file > +# > +BUILD_CC = "${CCACHE}${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" > +BUILD_CXX = "${CCACHE}${BUILD_PREFIX}clang++ ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" > +BUILD_FC = "${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" > +BUILD_CPP = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE} -E" > +BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" > +BUILD_CCLD = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH}" > +BUILD_AR = "${BUILD_PREFIX}llvm-ar" > +BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}" > +BUILD_RANLIB = "${BUILD_PREFIX}llvm-ranlib -D" > +BUILD_STRIP = "${BUILD_PREFIX}llvm-strip" > +BUILD_OBJCOPY = "${BUILD_PREFIX}llvm-objcopy" > +BUILD_OBJDUMP = "${BUILD_PREFIX}llvm-objdump" > +BUILD_NM = "${BUILD_PREFIX}llvn-nm" > +BUILD_READELF = "${BUILD_PREFIX}readelf" > +DEPENDS:append = " clang-native compiler-rt-native libcxx-native" > +# Use libcxx headers for native parts > +CXXFLAGS:append = " -stdlib=libc++" > +LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" > +BUILD_LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" Where/how does this get used? > diff --git a/meta/conf/toolchain/clang.inc b/meta/classes/clang.bbclass > similarity index 76% > rename from meta/conf/toolchain/clang.inc > rename to meta/classes/clang.bbclass > index 0e5f0769f85a8373c58d4b54dbe2bb1cf7dbd50b..be8b888918d1b4b4ae1d245df2c9da013cdc826e 100644 > --- a/meta/conf/toolchain/clang.inc > +++ b/meta/classes/clang.bbclass > @@ -17,9 +17,11 @@ READELF = "${HOST_PREFIX}llvm-readelf" > PREFERRED_PROVIDER_virtual/cross-cc = "${MLPREFIX}clang-cross-${TARGET_ARCH}" > PREFERRED_PROVIDER_virtual/cross-c++ = "${MLPREFIX}clang-cross-${TARGET_ARCH}" > PREFERRED_PROVIDER_virtual/compilerlibs = "gcc-runtime" > -PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" > -PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" > +PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "clang-crosssdk-${SDK_SYS}" > +PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "clang-crosssdk-${SDK_SYS}" > > -PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" > -PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" > +PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "clang-crosssdk-${SDK_SYS}" > +PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "clang-crosssdk-${SDK_SYS}" > PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" > + > +TCOVERRIDE = "toolchain-clang" This can probably be split into a separate patch and merged sooner. > diff --git a/meta/conf/toolchain/build-gcc.inc b/meta/classes/gcc-native.bbclass > similarity index 99% > rename from meta/conf/toolchain/build-gcc.inc > rename to meta/classes/gcc-native.bbclass > index a708bd0389a123504301fd151fb9ebdb677926be..1e1d68b027806b94e8229d4efef025cc1c038ad3 100644 > --- a/meta/conf/toolchain/build-gcc.inc > +++ b/meta/classes/gcc-native.bbclass > @@ -12,4 +12,3 @@ BUILD_OBJCOPY = "${BUILD_PREFIX}objcopy" > BUILD_OBJDUMP = "${BUILD_PREFIX}objdump" > BUILD_NM = "${BUILD_PREFIX}nm" > BUILD_READELF = "${BUILD_PREFIX}readelf" > - > diff --git a/meta/conf/toolchain/gcc.inc b/meta/classes/gcc.bbclass > similarity index 97% > rename from meta/conf/toolchain/gcc.inc > rename to meta/classes/gcc.bbclass > index 36d33f5d6d0bfbf0f36158f389c4112ce20d806b..75f9abe999a297c7b17e64e693ffd8f441bb16b1 100644 > --- a/meta/conf/toolchain/gcc.inc > +++ b/meta/classes/gcc.bbclass > @@ -24,3 +24,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" > PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" > PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" > > +TCOVERRIDE = "toolchain-gcc" The TCOVERRIDE pieces could also be a separate patch to move things forward until we resolve the inherit_defer/require/naming discussion? > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index e5037c6277841908df333b16adbe4e6cce55f814..cfd70498b246fa1bf03e4730ecd5bf5be759ed44 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -13,6 +13,8 @@ BASELIB = "lib" > BASELIB:libc-glibc:powerpc64 = "lib64" > BASELIB:libc-glibc:powerpc64le = "lib64" > > +TOOLCHAIN ??= "gcc" > + > # Path prefixes > export base_prefix = "" > export prefix = "/usr" > @@ -801,7 +803,7 @@ DISTRO_NAME ??= "OpenEmbedded" > # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. > # This works for functions as well, they are really just variables. > # > -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" > +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:${TCOVERRIDE}${LIBCOVERRIDE}:forcevariable" Lets pull the overrides bit into a separate patch. Cheers, Richard
On 5/22/25 3:50 AM, Richard Purdie wrote: > On Tue, 2025-05-20 at 23:19 -0700, Khem Raj via lists.openembedded.org wrote: >> This implements a toolchain selection mechanism with existing defaults >> unchanged. >> >> It introduces a variable called TOOLCHAIN, which denotes the familiar >> name for toolchain e.g. "gcc" which selects GNU compiler + binutils >> as default C/C++ toolchain or "clang" which will use LLVM/Clang Compiler >> >> Additionally build-gcc is used for selecting native compiler >> >> TOOLCHAIN variable has a global fallback to "gcc" in configuration >> metadata. A distro can switch to using say "clang" as default system >> compiler by defining >> >> TOOLCHAIN ?= "clang" >> >> In local.conf or other distro specific global configuration metadata >> >> It is also selectable at recipe scope, since not all packages are >> buildable with either clang or gcc, a recipe can explicitly demand >> a given toolchain e.g. glibc can not be built with clang therefore >> glibc recipe sets. >> >> TOOLCHAIN = "gcc" >> >> TCOVERRIDE is defined to toolchain-TOOLCHAIN and its added to OVERRIDES >> that a recipe can see and it can use "toolchain-gcc" or "toolchain-clang" >> to set specific metadata based upon global toolchain policy in distro. >> >> toolchain: Use TOOLCHAIN_NATIVE for defining native compiler >> >> This helps in selecting gcc or clang for native compiler irrespective >> of cross-compiler selection via TOOLCHAIN variable >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com> >> --- >> meta/classes-global/base.bbclass | 5 ++++ >> meta/classes-recipe/cross-canadian.bbclass | 2 ++ >> meta/classes-recipe/cross.bbclass | 2 ++ >> meta/classes-recipe/crosssdk.bbclass | 2 ++ >> meta/classes-recipe/native.bbclass | 2 ++ >> meta/classes-recipe/nativesdk.bbclass | 2 ++ >> meta/classes/clang-native.bbclass | 28 ++++++++++++++++++++++ >> .../toolchain/clang.inc => classes/clang.bbclass} | 10 ++++---- >> .../build-gcc.inc => classes/gcc-native.bbclass} | 1 - >> .../toolchain/gcc.inc => classes/gcc.bbclass} | 1 + >> meta/conf/bitbake.conf | 7 +++--- >> 11 files changed, 53 insertions(+), 9 deletions(-) > > This is definitely getting there, thanks for working through it. > > I think we're ready to agree that we should support toolchain > selection with the TOOLCHAIN variable and we should support toolchain > overrides. There are therefore some patches in this series which can > merge as we agree on that. > > One of the concerns I have left is the class naming as I think > "gcc.bbclass" is confusing in its own right. I'm wondering if we put > these classes into a toolchain directory to make it clearer. thats a good idea, perhaps I will move them into classes-toolchain/ folder. > > I do also conceptually prefer the idea of an inc file so I'm wondering > if we should see if some kind of require_defer syntax could work? > We will always have exceptions where packages are not buildable with one toolchain or other and I found that doing it in class + override is quite good and extensible to other toolchains in future with a global fallback. >> diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass >> index 8215969c7bb37c1a1b91e260cd31714fee2db87c..ab2f0686b7b09e004ba8d5bb609e81b19da67e38 100644 >> --- a/meta/classes-global/base.bbclass >> +++ b/meta/classes-global/base.bbclass >> @@ -6,6 +6,7 @@ >> >> BB_DEFAULT_TASK ?= "build" >> CLASSOVERRIDE ?= "class-target" >> +TCOVERRIDE ?= "toolchain-gcc" >> >> inherit patch >> inherit staging >> @@ -19,6 +20,10 @@ PACKAGECONFIG_CONFARGS ??= "" >> >> inherit metadata_scm >> >> +inherit gcc-native >> +inherit gcc >> +inherit_defer ${@oe.utils.ifelse(d.getVar('TOOLCHAIN') == 'clang', 'clang', '')} > > I'm a bit puzzled on why we can't defer the gcc inherit here too? I > guess that didn't work for some reason? > TOOLCHAIN variable is processed later for bbclassextend'ed recipes and competes with nativesdk's quest to be last in line of inherits, then having a default fallback toolchain to be gcc is a reasonable choice since we can not _yet_ use non-gcc toolchains to build complete set of recipes. Its getting there though. >> + >> def lsb_distro_identifier(d): >> adjust = d.getVar('LSB_DISTRO_ADJUST') >> adjust_func = None >> diff --git a/meta/classes-recipe/cross-canadian.bbclass b/meta/classes-recipe/cross-canadian.bbclass >> index 059d9aa95f57dd77a0ab5172c4c15c13ed3bc43e..a9dc6aa9bac7d5cc27331a505ed213aa9d402d4d 100644 >> --- a/meta/classes-recipe/cross-canadian.bbclass >> +++ b/meta/classes-recipe/cross-canadian.bbclass >> @@ -14,6 +14,8 @@ >> EXCLUDE_FROM_WORLD = "1" >> NATIVESDKLIBC ?= "libc-glibc" >> LIBCOVERRIDE = ":${NATIVESDKLIBC}" >> +TCOVERRIDE = "" >> +TOOLCHAIN = "" >> CLASSOVERRIDE = "class-cross-canadian" >> STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" >> >> diff --git a/meta/classes-recipe/cross.bbclass b/meta/classes-recipe/cross.bbclass >> index 93de9a527446554b93c1e323c7458cc7aacef799..7ebf37760ca1fcad8cd1a2ee41ef32a29cca9b92 100644 >> --- a/meta/classes-recipe/cross.bbclass >> +++ b/meta/classes-recipe/cross.bbclass >> @@ -10,6 +10,8 @@ inherit relocatable >> # no need for them to be a direct target of 'world' >> EXCLUDE_FROM_WORLD = "1" >> >> +TCOVERRIDE = "" >> +TOOLCHAIN = "" >> CLASSOVERRIDE = "class-cross" >> PACKAGES = "" >> PACKAGES_DYNAMIC = "" > > Wouldn't the recipes that include this class set TOOLCHAIN correctly > anyway? > > >> diff --git a/meta/classes-recipe/crosssdk.bbclass b/meta/classes-recipe/crosssdk.bbclass >> index 824b1bcff47bcd36a70aa1d7b8724b6cf07131ff..0c0144b26829d3b76d034a89133ee94cf760b86d 100644 >> --- a/meta/classes-recipe/crosssdk.bbclass >> +++ b/meta/classes-recipe/crosssdk.bbclass >> @@ -7,6 +7,8 @@ >> inherit cross >> >> CLASSOVERRIDE = "class-crosssdk" >> +TCOVERRIDE = "" >> +TOOLCHAIN = "" >> NATIVESDKLIBC ?= "libc-glibc" >> LIBCOVERRIDE = ":${NATIVESDKLIBC}" >> MACHINEOVERRIDES = "" > > Same question here. > >> diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass >> index 625975a69429389a5b231a19b17e8ed7a12d80ad..cbdace9b7021e90a4df2684d9eacda36112b46c6 100644 >> --- a/meta/classes-recipe/native.bbclass >> +++ b/meta/classes-recipe/native.bbclass >> @@ -108,6 +108,8 @@ PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" >> >> # we dont want libc-*libc to kick in for native recipes >> LIBCOVERRIDE = "" >> +TCOVERRIDE = "" >> +TOOLCHAIN = "" >> CLASSOVERRIDE = "class-native" >> MACHINEOVERRIDES = "" >> MACHINE_FEATURES = "" > > This, I can understand although I know there was "clang-native" support > in places. I guess that is deferred for now? > >> diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass >> index 7ecb4c12c1f0f2b9cc48da215006a153679facf8..440bc3a5c5434152dfe5c9c19db1c2be857cd794 100644 >> --- a/meta/classes-recipe/nativesdk.bbclass >> +++ b/meta/classes-recipe/nativesdk.bbclass >> @@ -13,6 +13,8 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S >> # libc for the SDK can be different to that of the target >> NATIVESDKLIBC ?= "libc-glibc" >> LIBCOVERRIDE = ":${NATIVESDKLIBC}" >> +TCOVERRIDE = "" >> +TOOLCHAIN = "" >> CLASSOVERRIDE = "class-nativesdk" >> MACHINEOVERRIDES = "" > > Do you have any plans to support building the SDK with clang? I'm just > wondering on the code direction here in the future. > yes precisely the reason, we can today create SDKs with both gcc and clang compiler toolchains in it. > >> diff --git a/meta/classes/clang-native.bbclass b/meta/classes/clang-native.bbclass >> new file mode 100644 >> index 0000000000000000000000000000000000000000..bf395eade73eaad18bf15f35d03bc0aec2223090 >> --- /dev/null >> +++ b/meta/classes/clang-native.bbclass >> @@ -0,0 +1,28 @@ >> +# inherit this class if you would like to use clang to compile the native >> +# version of your recipes instead of system compiler ( which is normally gcc ) >> +# on build machines >> +# to use it add >> +# >> +# inherit clang-native >> +# >> +# to the concerned recipe via a bbappend or directly to recipe file >> +# >> +BUILD_CC = "${CCACHE}${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" >> +BUILD_CXX = "${CCACHE}${BUILD_PREFIX}clang++ ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" >> +BUILD_FC = "${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" >> +BUILD_CPP = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE} -E" >> +BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" >> +BUILD_CCLD = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH}" >> +BUILD_AR = "${BUILD_PREFIX}llvm-ar" >> +BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}" >> +BUILD_RANLIB = "${BUILD_PREFIX}llvm-ranlib -D" >> +BUILD_STRIP = "${BUILD_PREFIX}llvm-strip" >> +BUILD_OBJCOPY = "${BUILD_PREFIX}llvm-objcopy" >> +BUILD_OBJDUMP = "${BUILD_PREFIX}llvm-objdump" >> +BUILD_NM = "${BUILD_PREFIX}llvn-nm" >> +BUILD_READELF = "${BUILD_PREFIX}readelf" >> +DEPENDS:append = " clang-native compiler-rt-native libcxx-native" >> +# Use libcxx headers for native parts >> +CXXFLAGS:append = " -stdlib=libc++" >> +LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" >> +BUILD_LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" > > Where/how does this get used? This is used when using clang-native to build native portions ( want to override native gcc ) e.g. chromium which requires it, there are other packages which can optionally use it when using clang toolchains qtwebengine, rust-llvm, rust to name a few. It makes it easy to use clang as native compiler. > > >> diff --git a/meta/conf/toolchain/clang.inc b/meta/classes/clang.bbclass >> similarity index 76% >> rename from meta/conf/toolchain/clang.inc >> rename to meta/classes/clang.bbclass >> index 0e5f0769f85a8373c58d4b54dbe2bb1cf7dbd50b..be8b888918d1b4b4ae1d245df2c9da013cdc826e 100644 >> --- a/meta/conf/toolchain/clang.inc >> +++ b/meta/classes/clang.bbclass >> @@ -17,9 +17,11 @@ READELF = "${HOST_PREFIX}llvm-readelf" >> PREFERRED_PROVIDER_virtual/cross-cc = "${MLPREFIX}clang-cross-${TARGET_ARCH}" >> PREFERRED_PROVIDER_virtual/cross-c++ = "${MLPREFIX}clang-cross-${TARGET_ARCH}" >> PREFERRED_PROVIDER_virtual/compilerlibs = "gcc-runtime" >> -PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" >> -PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" >> +PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "clang-crosssdk-${SDK_SYS}" >> +PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "clang-crosssdk-${SDK_SYS}" >> >> -PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" >> -PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" >> +PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "clang-crosssdk-${SDK_SYS}" >> +PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "clang-crosssdk-${SDK_SYS}" >> PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" >> + >> +TCOVERRIDE = "toolchain-clang" > > > This can probably be split into a separate patch and merged sooner. I kept this together for keep things building atomically across bisects etc. But I think I can separate adding the TCOVERRIDE logic to patch of its own. > >> diff --git a/meta/conf/toolchain/build-gcc.inc b/meta/classes/gcc-native.bbclass >> similarity index 99% >> rename from meta/conf/toolchain/build-gcc.inc >> rename to meta/classes/gcc-native.bbclass >> index a708bd0389a123504301fd151fb9ebdb677926be..1e1d68b027806b94e8229d4efef025cc1c038ad3 100644 >> --- a/meta/conf/toolchain/build-gcc.inc >> +++ b/meta/classes/gcc-native.bbclass >> @@ -12,4 +12,3 @@ BUILD_OBJCOPY = "${BUILD_PREFIX}objcopy" >> BUILD_OBJDUMP = "${BUILD_PREFIX}objdump" >> BUILD_NM = "${BUILD_PREFIX}nm" >> BUILD_READELF = "${BUILD_PREFIX}readelf" >> - >> diff --git a/meta/conf/toolchain/gcc.inc b/meta/classes/gcc.bbclass >> similarity index 97% >> rename from meta/conf/toolchain/gcc.inc >> rename to meta/classes/gcc.bbclass >> index 36d33f5d6d0bfbf0f36158f389c4112ce20d806b..75f9abe999a297c7b17e64e693ffd8f441bb16b1 100644 >> --- a/meta/conf/toolchain/gcc.inc >> +++ b/meta/classes/gcc.bbclass >> @@ -24,3 +24,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" >> PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" >> PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" >> >> +TCOVERRIDE = "toolchain-gcc" > > > The TCOVERRIDE pieces could also be a separate patch to move things > forward until we resolve the inherit_defer/require/naming discussion? > >> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf >> index e5037c6277841908df333b16adbe4e6cce55f814..cfd70498b246fa1bf03e4730ecd5bf5be759ed44 100644 >> --- a/meta/conf/bitbake.conf >> +++ b/meta/conf/bitbake.conf >> @@ -13,6 +13,8 @@ BASELIB = "lib" >> BASELIB:libc-glibc:powerpc64 = "lib64" >> BASELIB:libc-glibc:powerpc64le = "lib64" >> >> +TOOLCHAIN ??= "gcc" >> + >> # Path prefixes >> export base_prefix = "" >> export prefix = "/usr" >> @@ -801,7 +803,7 @@ DISTRO_NAME ??= "OpenEmbedded" >> # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. >> # This works for functions as well, they are really just variables. >> # >> -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" >> +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:${TCOVERRIDE}${LIBCOVERRIDE}:forcevariable" > > Lets pull the overrides bit into a separate patch. > > > Cheers, > > Richard
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 8215969c7bb37c1a1b91e260cd31714fee2db87c..ab2f0686b7b09e004ba8d5bb609e81b19da67e38 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -6,6 +6,7 @@ BB_DEFAULT_TASK ?= "build" CLASSOVERRIDE ?= "class-target" +TCOVERRIDE ?= "toolchain-gcc" inherit patch inherit staging @@ -19,6 +20,10 @@ PACKAGECONFIG_CONFARGS ??= "" inherit metadata_scm +inherit gcc-native +inherit gcc +inherit_defer ${@oe.utils.ifelse(d.getVar('TOOLCHAIN') == 'clang', 'clang', '')} + def lsb_distro_identifier(d): adjust = d.getVar('LSB_DISTRO_ADJUST') adjust_func = None diff --git a/meta/classes-recipe/cross-canadian.bbclass b/meta/classes-recipe/cross-canadian.bbclass index 059d9aa95f57dd77a0ab5172c4c15c13ed3bc43e..a9dc6aa9bac7d5cc27331a505ed213aa9d402d4d 100644 --- a/meta/classes-recipe/cross-canadian.bbclass +++ b/meta/classes-recipe/cross-canadian.bbclass @@ -14,6 +14,8 @@ EXCLUDE_FROM_WORLD = "1" NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" +TCOVERRIDE = "" +TOOLCHAIN = "" CLASSOVERRIDE = "class-cross-canadian" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" diff --git a/meta/classes-recipe/cross.bbclass b/meta/classes-recipe/cross.bbclass index 93de9a527446554b93c1e323c7458cc7aacef799..7ebf37760ca1fcad8cd1a2ee41ef32a29cca9b92 100644 --- a/meta/classes-recipe/cross.bbclass +++ b/meta/classes-recipe/cross.bbclass @@ -10,6 +10,8 @@ inherit relocatable # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" +TCOVERRIDE = "" +TOOLCHAIN = "" CLASSOVERRIDE = "class-cross" PACKAGES = "" PACKAGES_DYNAMIC = "" diff --git a/meta/classes-recipe/crosssdk.bbclass b/meta/classes-recipe/crosssdk.bbclass index 824b1bcff47bcd36a70aa1d7b8724b6cf07131ff..0c0144b26829d3b76d034a89133ee94cf760b86d 100644 --- a/meta/classes-recipe/crosssdk.bbclass +++ b/meta/classes-recipe/crosssdk.bbclass @@ -7,6 +7,8 @@ inherit cross CLASSOVERRIDE = "class-crosssdk" +TCOVERRIDE = "" +TOOLCHAIN = "" NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index 625975a69429389a5b231a19b17e8ed7a12d80ad..cbdace9b7021e90a4df2684d9eacda36112b46c6 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass @@ -108,6 +108,8 @@ PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" # we dont want libc-*libc to kick in for native recipes LIBCOVERRIDE = "" +TCOVERRIDE = "" +TOOLCHAIN = "" CLASSOVERRIDE = "class-native" MACHINEOVERRIDES = "" MACHINE_FEATURES = "" diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass index 7ecb4c12c1f0f2b9cc48da215006a153679facf8..440bc3a5c5434152dfe5c9c19db1c2be857cd794 100644 --- a/meta/classes-recipe/nativesdk.bbclass +++ b/meta/classes-recipe/nativesdk.bbclass @@ -13,6 +13,8 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # libc for the SDK can be different to that of the target NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" +TCOVERRIDE = "" +TOOLCHAIN = "" CLASSOVERRIDE = "class-nativesdk" MACHINEOVERRIDES = "" diff --git a/meta/classes/clang-native.bbclass b/meta/classes/clang-native.bbclass new file mode 100644 index 0000000000000000000000000000000000000000..bf395eade73eaad18bf15f35d03bc0aec2223090 --- /dev/null +++ b/meta/classes/clang-native.bbclass @@ -0,0 +1,28 @@ +# inherit this class if you would like to use clang to compile the native +# version of your recipes instead of system compiler ( which is normally gcc ) +# on build machines +# to use it add +# +# inherit clang-native +# +# to the concerned recipe via a bbappend or directly to recipe file +# +BUILD_CC = "${CCACHE}${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" +BUILD_CXX = "${CCACHE}${BUILD_PREFIX}clang++ ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" +BUILD_FC = "${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE}" +BUILD_CPP = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH} -isysroot=${STAGING_DIR_NATIVE} -E" +BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" +BUILD_CCLD = "${BUILD_PREFIX}clang ${BUILD_CC_ARCH}" +BUILD_AR = "${BUILD_PREFIX}llvm-ar" +BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}" +BUILD_RANLIB = "${BUILD_PREFIX}llvm-ranlib -D" +BUILD_STRIP = "${BUILD_PREFIX}llvm-strip" +BUILD_OBJCOPY = "${BUILD_PREFIX}llvm-objcopy" +BUILD_OBJDUMP = "${BUILD_PREFIX}llvm-objdump" +BUILD_NM = "${BUILD_PREFIX}llvn-nm" +BUILD_READELF = "${BUILD_PREFIX}readelf" +DEPENDS:append = " clang-native compiler-rt-native libcxx-native" +# Use libcxx headers for native parts +CXXFLAGS:append = " -stdlib=libc++" +LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" +BUILD_LDFLAGS:append = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc" diff --git a/meta/conf/toolchain/clang.inc b/meta/classes/clang.bbclass similarity index 76% rename from meta/conf/toolchain/clang.inc rename to meta/classes/clang.bbclass index 0e5f0769f85a8373c58d4b54dbe2bb1cf7dbd50b..be8b888918d1b4b4ae1d245df2c9da013cdc826e 100644 --- a/meta/conf/toolchain/clang.inc +++ b/meta/classes/clang.bbclass @@ -17,9 +17,11 @@ READELF = "${HOST_PREFIX}llvm-readelf" PREFERRED_PROVIDER_virtual/cross-cc = "${MLPREFIX}clang-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/cross-c++ = "${MLPREFIX}clang-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/compilerlibs = "gcc-runtime" -PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "clang-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "clang-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "clang-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "clang-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" + +TCOVERRIDE = "toolchain-clang" diff --git a/meta/conf/toolchain/build-gcc.inc b/meta/classes/gcc-native.bbclass similarity index 99% rename from meta/conf/toolchain/build-gcc.inc rename to meta/classes/gcc-native.bbclass index a708bd0389a123504301fd151fb9ebdb677926be..1e1d68b027806b94e8229d4efef025cc1c038ad3 100644 --- a/meta/conf/toolchain/build-gcc.inc +++ b/meta/classes/gcc-native.bbclass @@ -12,4 +12,3 @@ BUILD_OBJCOPY = "${BUILD_PREFIX}objcopy" BUILD_OBJDUMP = "${BUILD_PREFIX}objdump" BUILD_NM = "${BUILD_PREFIX}nm" BUILD_READELF = "${BUILD_PREFIX}readelf" - diff --git a/meta/conf/toolchain/gcc.inc b/meta/classes/gcc.bbclass similarity index 97% rename from meta/conf/toolchain/gcc.inc rename to meta/classes/gcc.bbclass index 36d33f5d6d0bfbf0f36158f389c4112ce20d806b..75f9abe999a297c7b17e64e693ffd8f441bb16b1 100644 --- a/meta/conf/toolchain/gcc.inc +++ b/meta/classes/gcc.bbclass @@ -24,3 +24,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" +TCOVERRIDE = "toolchain-gcc" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e5037c6277841908df333b16adbe4e6cce55f814..cfd70498b246fa1bf03e4730ecd5bf5be759ed44 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -13,6 +13,8 @@ BASELIB = "lib" BASELIB:libc-glibc:powerpc64 = "lib64" BASELIB:libc-glibc:powerpc64le = "lib64" +TOOLCHAIN ??= "gcc" + # Path prefixes export base_prefix = "" export prefix = "/usr" @@ -801,7 +803,7 @@ DISTRO_NAME ??= "OpenEmbedded" # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. # This works for functions as well, they are really just variables. # -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:${TCOVERRIDE}${LIBCOVERRIDE}:forcevariable" FILE_LAYERNAME ??= "config" LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" @@ -834,9 +836,6 @@ include conf/licenses.conf require conf/sanity.conf include conf/bblock.conf -require toolchain/gcc.inc -require toolchain/build-gcc.inc - ################################################################## # Weak variables (usually to retain backwards compatibility) ##################################################################
This implements a toolchain selection mechanism with existing defaults unchanged. It introduces a variable called TOOLCHAIN, which denotes the familiar name for toolchain e.g. "gcc" which selects GNU compiler + binutils as default C/C++ toolchain or "clang" which will use LLVM/Clang Compiler Additionally build-gcc is used for selecting native compiler TOOLCHAIN variable has a global fallback to "gcc" in configuration metadata. A distro can switch to using say "clang" as default system compiler by defining TOOLCHAIN ?= "clang" In local.conf or other distro specific global configuration metadata It is also selectable at recipe scope, since not all packages are buildable with either clang or gcc, a recipe can explicitly demand a given toolchain e.g. glibc can not be built with clang therefore glibc recipe sets. TOOLCHAIN = "gcc" TCOVERRIDE is defined to toolchain-TOOLCHAIN and its added to OVERRIDES that a recipe can see and it can use "toolchain-gcc" or "toolchain-clang" to set specific metadata based upon global toolchain policy in distro. toolchain: Use TOOLCHAIN_NATIVE for defining native compiler This helps in selecting gcc or clang for native compiler irrespective of cross-compiler selection via TOOLCHAIN variable Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/classes-global/base.bbclass | 5 ++++ meta/classes-recipe/cross-canadian.bbclass | 2 ++ meta/classes-recipe/cross.bbclass | 2 ++ meta/classes-recipe/crosssdk.bbclass | 2 ++ meta/classes-recipe/native.bbclass | 2 ++ meta/classes-recipe/nativesdk.bbclass | 2 ++ meta/classes/clang-native.bbclass | 28 ++++++++++++++++++++++ .../toolchain/clang.inc => classes/clang.bbclass} | 10 ++++---- .../build-gcc.inc => classes/gcc-native.bbclass} | 1 - .../toolchain/gcc.inc => classes/gcc.bbclass} | 1 + meta/conf/bitbake.conf | 7 +++--- 11 files changed, 53 insertions(+), 9 deletions(-)