From a2533a978c8d03bd108b57ea47aa5f91d373f0f2 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 20 Mar 2014 11:16:04 -0700 Subject: [PATCH 1/2] lttng-tools: resurrect -O1 workaround dropped by #21 This is needed currently, as our 2013.11 and 2014.05 IB 1 toolchains are affected by gcc bug 58595, which is JIRA: CB-3083. Signed-off-by: Christopher Larson --- .../compile-consumers-with-o1.patch | 30 +++++++++++++++++++ .../lttng/lttng-tools_2.4.0.bbappend | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch create mode 100644 core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend diff --git a/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch b/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch new file mode 100644 index 0000000..110f653 --- /dev/null +++ b/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch @@ -0,0 +1,30 @@ +diff --git a/src/common/consumer.c b/src/common/consumer.c +index ede214c..b10988b 100644 +--- a/src/common/consumer.c ++++ b/src/common/consumer.c +@@ -1,3 +1,5 @@ ++#pragma GCC optimize ("O1") ++ + /* + * Copyright (C) 2011 - Julien Desfossez + * Mathieu Desnoyers +diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c +index d15329f..78c7725 100644 +--- a/src/common/kernel-consumer/kernel-consumer.c ++++ b/src/common/kernel-consumer/kernel-consumer.c +@@ -1,3 +1,5 @@ ++#pragma GCC optimize ("O1") ++ + /* + * Copyright (C) 2011 - Julien Desfossez + * Mathieu Desnoyers +diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c +index 0955e66..0f8f75a 100644 +--- a/src/common/ust-consumer/ust-consumer.c ++++ b/src/common/ust-consumer/ust-consumer.c +@@ -1,3 +1,5 @@ ++#pragma GCC optimize ("O1") ++ + /* + * Copyright (C) 2011 - Julien Desfossez + * Mathieu Desnoyers diff --git a/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend b/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend new file mode 100644 index 0000000..d7581b6 --- /dev/null +++ b/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +SRC_URI_append_arm = " file://compile-consumers-with-o1.patch" From a006aca1be22fcbf3362d067e04434101adb0863 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 27 Mar 2014 11:39:36 -0700 Subject: [PATCH 2/2] external-sourcery-toolchain: deal with more sanity checks Signed-off-by: Christopher Larson --- recipes/meta/external-sourcery-toolchain.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 734c182..afb6d73 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -174,6 +174,10 @@ FILES_${PN}-dbg += "${libdir}/mettools/.debug" # Inhibit warnings about files being stripped, we can't do anything about it. INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# We support multiple toolchain versions, so an unpackaged file isn't +# necessarily a problem. +ERROR_QA_remove = "installed-vs-shipped" + # This test should be fixed to ignore .a files in .debug dirs INSANE_SKIP_${PN}-dbg = "staticdev" @@ -187,6 +191,9 @@ INSANE_SKIP_libquadmath += "ldflags" INSANE_SKIP_libstdc++ += "ldflags" INSANE_SKIP_gdbserver += "ldflags" +# We don't care about rpaths in third party binaries +INSANE_SKIP_${PN}-utils += "useless-rpaths" + PKGV = "${CSL_VER_LIBC}" PKGV_libgcc = "${CSL_VER_GCC}" PKGV_libgcc-dev = "${CSL_VER_GCC}"