From e6abd3da9ef722728f2da0245c72f8c1580df3a9340f8631e8bead58d97447e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 16 Mar 2016 13:27:26 +0000 Subject: [PATCH] - Add back libstdc++-devel dependency for clang since libc++ is only available for x86-64 atm. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=438 --- llvm-armv6-triple.patch | 27 --------------------------- llvm.changes | 3 ++- llvm.spec | 4 +--- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 llvm-armv6-triple.patch diff --git a/llvm-armv6-triple.patch b/llvm-armv6-triple.patch deleted file mode 100644 index 840117a..0000000 --- a/llvm-armv6-triple.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: include/llvm/Support/ARMTargetParser.def -=================================================================== ---- include/llvm/Support/ARMTargetParser.def -+++ include/llvm/Support/ARMTargetParser.def -@@ -179,7 +179,8 @@ - ARM_CPU_NAME("arm1136j-s", AK_ARMV6, FK_NONE, false, AEK_NONE) - ARM_CPU_NAME("arm1136jf-s", AK_ARMV6, FK_VFPV2, true, AEK_NONE) - ARM_CPU_NAME("arm1136jz-s", AK_ARMV6, FK_NONE, false, AEK_NONE) --ARM_CPU_NAME("arm1176j-s", AK_ARMV6K, FK_NONE, true, AEK_NONE) -+ARM_CPU_NAME("arm1176jz-s", AK_ARMV6K, FK_NONE, false, AEK_NONE) -+ARM_CPU_NAME("arm1176jzf-s", AK_ARMV6K, FK_VFPV2, true, AEK_NONE) - ARM_CPU_NAME("arm1176jz-s", AK_ARMV6KZ, FK_NONE, false, AEK_NONE) - ARM_CPU_NAME("mpcore", AK_ARMV6K, FK_VFPV2, false, AEK_NONE) - ARM_CPU_NAME("mpcorenovfp", AK_ARMV6K, FK_NONE, false, AEK_NONE) -Index: unittests/ADT/TripleTest.cpp -=================================================================== ---- unittests/ADT/TripleTest.cpp -+++ unittests/ADT/TripleTest.cpp -@@ -889,7 +889,7 @@ - } - { - llvm::Triple Triple("armv6k-unknown-eabi"); -- EXPECT_EQ("arm1176j-s", Triple.getARMCPUForArch()); -+ EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch()); - } - { - llvm::Triple Triple("armv6kz-unknown-eabi"); diff --git a/llvm.changes b/llvm.changes index 333e917..71c52d7 100644 --- a/llvm.changes +++ b/llvm.changes @@ -2,7 +2,8 @@ Wed Mar 16 09:28:51 UTC 2016 - idonmez@suse.com - Use gcc for stage1 bootstrap -- Add llvm-armv6-triple.patch to fix armv6 triple regression. +- Add back libstdc++-devel dependency for clang since libc++ is + only available for x86-64 atm. ------------------------------------------------------------------- Thu Mar 10 12:05:39 UTC 2016 - idonmez@suse.com diff --git a/llvm.spec b/llvm.spec index debad31..9c4dbaf 100644 --- a/llvm.spec +++ b/llvm.spec @@ -70,7 +70,6 @@ Patch7: llvm-fix-find-gcc5-install.patch Patch8: revert-cmake-soname.patch Patch9: lldb-cmake.patch Patch10: glibc-2.23-libcxx.patch -Patch11: llvm-armv6-triple.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: binutils-devel >= 2.21.90 BuildRequires: bison @@ -117,7 +116,7 @@ new native programs that use the LLVM infrastructure. %package clang Summary: CLANG frontend for LLVM Group: Development/Languages/Other -Provides: clang +Requires: libstdc++-devel %description clang This package contains the clang (C language) frontend for LLVM. @@ -186,7 +185,6 @@ disassembler. #%if 0%{?suse_version} > 1320 #%patch10 #%endif -#%patch11 # Move into right place mv cfe-%{version}.src tools/clang