diff mbox series

[meta-oe] tbb: Disable LTO on rv64

Message ID 20211229032013.57537-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] tbb: Disable LTO on rv64 | expand

Commit Message

Khem Raj Dec. 29, 2021, 3:20 a.m. UTC 
ABI mismatches still happen with clang on rv64 as well so disable
LTO for now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch b/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch
index 093c828fe6..662065635d 100644
--- a/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch
+++ b/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch
@@ -1,7 +1,7 @@ 
 From 95a5c97122b7c5bdeba61f2e890bae9a961dd4bf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 8 Dec 2021 10:01:22 -0800
-Subject: [PATCH] Disable LTO on clang/riscv32
+Subject: [PATCH] Disable LTO on clang/riscv
 
 With clang in OE LTO does not work as it does not seem to carry right
 target info and mixes ABIs
@@ -23,7 +23,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  # Enabling LTO on Android causes the NDK bug.
  # NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
 -if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS)
-+if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(riscv32|arm)")
++if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(riscv32|riscv64|arm)")
      set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
      set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
  endif()