OpenEmbedded

openembedded@lists.linaro.org

6 participants
111 discussions

CES blockers with https://github.com/ndechesne/meta-qcom "master"

by Joel Winarske

Hi folks, I have two CES blockers with the master branch of https://github.com/ndechesne/meta-qcom 1. The build it defaulting to uni-proc. What change is required to enable all the cores. 2. Issuing reboot in a terminal window will not cause the device to reboot. A power cycle is required after issuing "reboot" from console. Regards, Joel Winarske (prior QC Senior Staff Engineer) Senior Embedded Software Engineer INRIX (206) 512-6779

9 years, 2 months

[meta-linaro][morty][PATCH] binutils linaro-2.25: fix buildfailure on armv7a for all binutils

by Max Krummenacher

Sync deletions with OE-core git recipe for all flavours of binutils, not just binutils_linaro-2.25.bb. Without this binutils stage files which later also get staged when building gdb-cross. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- .../recipes-devtools/binutils/binutils-linaro-2.25.inc | 4 ++++ .../recipes-devtools/binutils/binutils_linaro-2.25.bb | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc index 12144d5..799304d 100644 --- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc @@ -37,3 +37,7 @@ SRC_URI = "\ " S = "${WORKDIR}/git" + +do_configure_prepend() { + rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim +} diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.25.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.25.bb index fae877a..ef5b7c5 100644 --- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.25.bb +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.25.bb @@ -14,13 +14,6 @@ EXTRA_OECONF_class-native = "--enable-targets=all \ --enable-install-libbfd \ --enable-install-libiberty" -# Get rid of gdb sub-directory -do_unpack_extra() { - rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim -} - -addtask unpack_extra after do_unpack before do_patch - do_install_class-native () { autotools_do_install -- 2.5.5

9 years, 2 months

[meta-linaro-toolchain][PATCH 1/2] gcc-4.9: fix incorrect checksums

by Jack Mitchell

Signed-off-by: Jack Mitchell <jack(a)embed.me.uk> --- meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.9.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.9.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.9.inc index 6e2be77..549bf6f 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.9.inc @@ -16,10 +16,10 @@ NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=59530bdf33659b29e73d4adb9f9f64.9 \ + file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=2d525d4aa3495befef8f17206a5b0a1 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ " -- 2.10.0

9 years, 4 months

Re: meta-optee/optee-os: ARM64 hardcoding

by Koen Kooi

> Op 6 sep. 2016, om 20:42 heeft Denys Dmytriyenko <denis(a)denix.org> het volgende geschreven: > > Koen, Fathi, et al, > > Any chance to get EXTRA_OEMAKE to not hardcode ARM64 flags? > > https://git.linaro.org/openembedded/meta-linaro.git/blob/HEAD:/meta-optee/r… It’s not planned, but we wouldn’t say no to patches :) -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

9 years, 5 months

[PATCH v3] mali-userland-drm: add support for mali450 binaries for hikey

by Andrey Konovalov

Greetings, Have to call it "v3" as I've sent a different patch with "v2" earlier. This is a reworked version of "[PATCH] mali-userland-drm: add support for mali450 binaries for hikey": - the __anonymous() function (inspired by mesa.inc) removed, as I doubt that it adds value in this case, and am not sure it handles the package names correctly. - recipe file name changed. Tried to minimize the use of non-default values where possible. All in all, it now looks more similar to [1]. - using the mesa_%.bbappend looks unavoidable for me, and it should match the files included into the driver tarball (from SRC_URI), so the mesa_%.bbappend has been added to this patch. - more comments added. Regarding the PACKAGE_ARCH = "${MACHINE_ARCH}", the driver is indeed specific for HiKey (would not fit other boards with mali450), but I don't know the details. Thanks, Andrey [1] https://github.com/ARM-software/meta-mali/blob/master/recipes-graphics/mali… From: Andrey Konovalov <andrey.konovalov(a)linaro.org> Date: Wed, 8 Jun 2016 00:07:21 +0300 Subject: [PATCH 1/4] Add public Mali450 driver for wayland Signed-off-by: Andrey Konovalov <andrey.konovalov(a)linaro.org> --- .../mali-userland/mali450-userland_r6p0_01rel0.bb | 55 ++++++++++++++++++++++ recipes-graphics/mesa/mesa_%.bbappend | 11 +++++ 2 files changed, 66 insertions(+) create mode 100644 recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb create mode 100644 recipes-graphics/mesa/mesa_%.bbappend diff --git a/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb b/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb new file mode 100644 index 0000000..63bcf51 --- /dev/null +++ b/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Mali450 libraries (drm backend)" + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${WORKDIR}/END_USER_LICENCE_AGREEMENT.txt;md5=3918cc9836ad038c5a090a0280233eea" + +SRC_URI[md5sum] = "36f39e86ccfe5a6a4cb2090865c339ba" +SRC_URI[sha256sum] = "dd136931cdbb309c0ce30297c06f7c6b0a48450f51acbbbc10529d341977f728" + +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libdrm" + +DEPENDS = "virtual/mesa" + +BACKEND="drm" + +SRC_URI = " http://malideveloper.arm.com/downloads/drivers/binary/utgard/r6p0-01rel0/ma…" + +S = "${WORKDIR}/wayland-drm" + +# The SRC is just a set of binaries to install - nothing to configure and to +# compile +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -m 755 -d ${D}/${libdir} + install ${S}/libMali.so ${D}/${libdir} + ln -sf libMali.so ${D}/${libdir}/libEGL.so.1.4 + ln -sf libEGL.so.1.4 ${D}/${libdir}/libEGL.so.1 + ln -sf libEGL.so.1 ${D}/${libdir}/libEGL.so + ln -sf libMali.so ${D}/${libdir}/libGLESv1_CM.so.1.1 + ln -sf libGLESv1_CM.so.1.1 ${D}/${libdir}/libGLESv1_CM.so.1 + ln -sf libGLESv1_CM.so.1 ${D}/${libdir}/libGLESv1_CM.so + ln -sf libMali.so ${D}/${libdir}/libGLESv2.so.2.0 + ln -sf libGLESv2.so.2.0 ${D}/${libdir}/libGLESv2.so.2 + ln -sf libGLESv2.so.2 ${D}/${libdir}/libGLESv2.so + ln -sf libMali.so ${D}/${libdir}/libgbm.so.1 + ln -sf libgbm.so.1 ${D}/${libdir}/libgbm.so + ln -sf libMali.so ${D}/${libdir}/libwayland-egl.so +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# The mali-450 driver tarball has only *.so files, so all the packages +# except the ${PN} one would be empty +PACKAGES = "${PN}" +FILES_${PN} += "${libdir}/*.so* " + +INSANE_SKIP_${PN} = "ldflags dev-so" + +# To get the egl/gles headers and the packageconfig files (missing from this +# mali-450 driver tarball) we have to build mesa, and to handle the conflicts +# due to both mali450-userland, and mesa providing the same libraries. +RREPLACES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" +RPROVIDES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" +RCONFLICTS_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend new file mode 100644 index 0000000..3020b2b --- /dev/null +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,11 @@ +# Remove the *.so libraries - the ones provided by mali-450 driver are to +# be used for HiKey +do_install_append() { + rm -f ${D}/${libdir}/libEGL.so* + rm -f ${D}/${libdir}/libGLESv1_CM.so* + rm -f ${D}/${libdir}/libGLESv2.so* + rm -f ${D}/${libdir}/libgbm.so* + rm -f ${D}/${libdir}/libwayland-egl.so* +} + +PROVIDES_remove = "virtual/libgles1 virtual/libgles2 virtual/egl" -- 1.9.1

9 years, 8 months

[meta-linaro][PATCH] external-linaro-toolchain.bb: stop using base_contains 2nd

by Max Krummenacher

The base_contains function is deprecated and we ought to use bb.utils.contains instead. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- Hi missed that one with my sed script in patch 9d228b1d2dc6e2e3f677c04cb83bbb6e04319e94 Sorry about that. Max .../external-linaro-toolchain/external-linaro-toolchain.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 6a72ff7..eb82e96 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -93,7 +93,7 @@ do_install() { fi # fix up the copied symlinks (they are still pointing to the multiarch directory) - linker_name="${(a)bb.utils.contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", base_contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}" + linker_name="${(a)bb.utils.contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}" ln -sf ld-${ELT_VER_LIBC}.so ${D}${base_libdir}/${linker_name} ln -sf ../../lib/libnsl.so.1 ${D}${libdir}/libnsl.so ln -sf ../../lib/librt.so.1 ${D}${libdir}/librt.so -- 2.6.6

9 years, 8 months

[PATCH] mali-userland-drm: add support for mali450 binaries for hikey

by Koen Kooi

From: Zoltan Kuscsik <zoltan.kuscsik(a)linaro.org> --- .../mali-userland/mali450-userland-drm_binary.bb | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 recipes-graphics/mali-userland/mali450-userland-drm_binary.bb diff --git a/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb b/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb new file mode 100644 index 0000000..3b1c438 --- /dev/null +++ b/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb @@ -0,0 +1,75 @@ +SUMMARY = "Mali400 libraries (drm backend)" +DESCRIPTION = "Mali400 libraries (opengles, egl...)" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=6b6d38be6224fa5948bf814d28cc2197" + +PROVIDES = "mali450-userland virtual/egl virtual/libgles1 virtual/libgles2" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "libdrm mesa" + +PV_MALI="r6p0" +PR_MALI="01rel0" + +PR="${PR_MALI}.binary" + +BACKEND="drm" + +MALI_DIRECTORY="mali450-userland-${BACKEND}-${PV_MALI}-${PR_MALI}-release" +SRC_URI = "file://${MALI_DIRECTORY}.tgz" + +S = "${WORKDIR}/${MALI_DIRECTORY}" + +#action stubbed +do_configure[noexec] = "1" +do_compile[noexec] = "1" + + +do_install() { + install -m 755 -d ${D}/usr/ + cp -aR ${S}/usr ${D}/ +} + +PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-test " + +INSANE_SKIP_${PN} = "dev-so" +FILES_SOLIBSDEV = "" + +FILES_${PN} += "${libdir}/libMali.so* ${libdir}/*.so" +FILES_${PN}-dev += "${includedir} ${libdir}/pkgconfig/" +FILES_${PN}-dbg += "${libdir}/.debug/ ${bindir}/.debug/ " + +FILES_${PN}-test = "${exec_prefix}/share/gles2_test/ ${exec_prefix}/share/egl_test " +FILES_${PN}-test += "${exec_prefix}/bin/platform_test_suite" +FILES_${PN}-test += "${exec_prefix}/bin/egl_api_main_suite_20" +FILES_${PN}-test += "${exec_prefix}/bin/gles2_api_suite" + +RREPLACES_${PN} = "libglesv2-2 " +RPROVIDES_${PN} = "libglesv2-2 " +RCONFLICTS_${PN} = "libglesv2-2 " + + +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mali450 suffix), and +# RPROVIDEs/RCONFLICTs on the generic libgl name. +python __anonymous() { + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() + for p in (("libegl"), ("libegl1"), + ("gles"), ("libgles1"), ("libglesv1-cm1"), + ("libgles2"), ("mali450-userland")): + fullp = "mali450-userland" + pkgs = " " + p + " " + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "mali450-userland-dev" + pkgs = " " + p + "-dev " + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) +} + -- 2.4.3

9 years, 8 months

Mali recipe

by Zoltan Kuscsik

Hi, here is a proposed recipe for enabling Mali 450 driver in meta-96boards: https://github.com/kuscsik/meta-los/blob/hikey/recipes-graphics/mali-userla… Feedback is welcome, Zoltan -- Zoltan Kuscsik Senior Software Developer, Linaro Digital Home Group email: zoltan.kuscsik(a)linaro.org IRC: zoli_ on irc.linaro.org

9 years, 8 months

[meta-linaro][PATCH 1/2] gdb_linaro-7.8.bb: stop using base_contains

by Max Krummenacher

The base_contains function is deprecated and we ought to use bb.utils.contains instead. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb b/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb index 3ce2de4..630d43c 100644 --- a/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb +++ b/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb @@ -7,7 +7,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" do_configure_prepend() { - if [ -n "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then + if [ -n "${(a)bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh case "\$2" in -- 2.6.6

9 years, 8 months

Re: [PATCH] gcc-linaro-5.2: Fix build with gcc6 on host

by Koen Kooi

Added into gerrit: https://review.linaro.org/11998 On 15 May 2016 at 18:28, Khem Raj <raj.khem(a)gmail.com> wrote: > Backport OE-core fix > > Signed-off-by: Khem Raj <raj.khem(a)gmail.com> > --- > .../recipes-devtools/gcc/gcc-linaro-5.2.inc | 1 + > .../0060-remove-prototypes-cfns.patch | 153 +++++++++++++++++++++ > 2 files changed, 154 insertions(+) > create mode 100644 meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch > > diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc > index ca44d66..f928e77 100644 > --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc > +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc > @@ -108,6 +108,7 @@ SRC_URI = "https://releases.linaro.org/components/toolchain/gcc-linaro/${BASEPV} > file://0041-handle-target-sysroot-multilib.patch \ > file://0042-cxxflags-for-build.patch \ > file://PR67954.patch \ > + file://0060-remove-prototypes-cfns.patch \ > " > > # file://0038-fix-g++-sysroot.patch > diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch > new file mode 100644 > index 0000000..2452b6f > --- /dev/null > +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch > @@ -0,0 +1,153 @@ > +Upstream-Status: backport > + > +From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001 > +From: edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4> > +Date: Thu, 25 Feb 2016 15:33:50 +0000 > +Subject: [PATCH] 2016-02-25 Bernd Edlinger <bernd.edlinger(a)hotmail.de> > + > + Backported from mainline > + 2016-02-19 Jakub Jelinek <jakub(a)redhat.com> > + Bernd Edlinger <bernd.edlinger(a)hotmail.de> > + > + * Make-lang.in: Invoke gperf with -L C++. > + * cfns.gperf: Remove prototypes for hash and libc_name_p > + inlines. > + * cfns.h: Regenerated. > + * except.c (nothrow_libfn_p): Adjust. > + > + > +--- > + gcc/cp/Make-lang.in | 2 +- > + gcc/cp/cfns.gperf | 10 ++-------- > + gcc/cp/cfns.h | 41 ++++++++++++++--------------------------- > + gcc/cp/except.c | 3 ++- > + 5 files changed, 31 insertions(+), 37 deletions(-) > + > +diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in > +index e98beb1..b09fb02 100644 > +--- a/gcc/cp/Make-lang.in > ++++ b/gcc/cp/Make-lang.in > +@@ -111,7 +111,7 @@ else > + # deleting the $(srcdir)/cp/cfns.h file. > + $(srcdir)/cp/cfns.h: > + endif > +- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ > ++ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ > + $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h > + > + # > +diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf > +index 68acd3d..214ecf6 100644 > +--- a/gcc/cp/cfns.gperf > ++++ b/gcc/cp/cfns.gperf > +@@ -1,3 +1,5 @@ > ++%language=C++ > ++%define class-name libc_name > + %{ > + /* Copyright (C) 2000-2015 Free Software Foundation, Inc. > + > +@@ -16,14 +18,6 @@ for more details. > + You should have received a copy of the GNU General Public License > + along with GCC; see the file COPYING3. If not see > + <http://www.gnu.org/licenses/>. */ > +-#ifdef __GNUC__ > +-__inline > +-#endif > +-static unsigned int hash (const char *, unsigned int); > +-#ifdef __GNUC__ > +-__inline > +-#endif > +-const char * libc_name_p (const char *, unsigned int); > + %} > + %% > + # The standard C library functions, for feeding to gperf; the result is used > +diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h > +index 1c6665d..596f413 100644 > +--- a/gcc/cp/cfns.h > ++++ b/gcc/cp/cfns.h > +@@ -1,5 +1,5 @@ > +-/* ANSI-C code produced by gperf version 3.0.3 */ > +-/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ > ++/* C++ code produced by gperf version 3.0.4 */ > ++/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ > + > + #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ > + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ > +@@ -28,7 +28,7 @@ > + #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf(a)gnu.org>." > + #endif > + > +-#line 1 "cfns.gperf" > ++#line 3 "cfns.gperf" > + > + /* Copyright (C) 2000-2015 Free Software Foundation, Inc. > + > +@@ -47,25 +47,18 @@ for more details. > + You should have received a copy of the GNU General Public License > + along with GCC; see the file COPYING3. If not see > + <http://www.gnu.org/licenses/>. */ > +-#ifdef __GNUC__ > +-__inline > +-#endif > +-static unsigned int hash (const char *, unsigned int); > +-#ifdef __GNUC__ > +-__inline > +-#endif > +-const char * libc_name_p (const char *, unsigned int); > + /* maximum key range = 391, duplicates = 0 */ > + > +-#ifdef __GNUC__ > +-__inline > +-#else > +-#ifdef __cplusplus > +-inline > +-#endif > +-#endif > +-static unsigned int > +-hash (register const char *str, register unsigned int len) > ++class libc_name > ++{ > ++private: > ++ static inline unsigned int hash (const char *str, unsigned int len); > ++public: > ++ static const char *libc_name_p (const char *str, unsigned int len); > ++}; > ++ > ++inline unsigned int > ++libc_name::hash (register const char *str, register unsigned int len) > + { > + static const unsigned short asso_values[] = > + { > +@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) > + return hval + asso_values[(unsigned char)str[len - 1]]; > + } > + > +-#ifdef __GNUC__ > +-__inline > +-#ifdef __GNUC_STDC_INLINE__ > +-__attribute__ ((__gnu_inline__)) > +-#endif > +-#endif > + const char * > +-libc_name_p (register const char *str, register unsigned int len) > ++libc_name::libc_name_p (register const char *str, register unsigned int len) > + { > + enum > + { > +diff --git a/gcc/cp/except.c b/gcc/cp/except.c > +index 3ff1ce6..2f2e396 100644 > +--- a/gcc/cp/except.c > ++++ b/gcc/cp/except.c > +@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn) > + unless the system headers are playing rename tricks, and if > + they are, we don't want to be confused by them. */ > + id = DECL_NAME (fn); > +- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); > ++ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), > ++ IDENTIFIER_LENGTH (id)); > + } > + > + /* Returns nonzero if an exception of type FROM will be caught by a > +-- > +2.8.2 > + > -- > 2.8.2 > -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

9 years, 9 months

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

OpenEmbedded