diff --git a/llvm-arm1176jz-s.patch b/llvm-arm1176jz-s.patch deleted file mode 100644 index 840117a..0000000 --- a/llvm-arm1176jz-s.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 467ec0e..71c52d7 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 21 08:05:09 UTC 2016 - idonmez@suse.com - -- Add llvm-arm1176jz-s.patch to fix an ARMv6 regression. - ------------------------------------------------------------------- Wed Mar 16 09:28:51 UTC 2016 - idonmez@suse.com diff --git a/llvm.spec b/llvm.spec index 2f649db..0a9e390 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-arm1176jz-s.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: binutils-devel >= 2.21.90 BuildRequires: bison @@ -186,9 +185,6 @@ disassembler. #%if 0%{?suse_version} > 1320 #%patch10 #%endif -%ifarch %{arm} -%patch11 -%endif # Move into right place mv cfe-%{version}.src tools/clang @@ -237,10 +233,9 @@ cmake -G "Ninja" \ -DLLVM_TARGETS_TO_BUILD=host \ -DLLDB_DISABLE_PYTHON=ON \ %ifarch armv6hl - -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ - -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ %endif -%ifarch armv7hl -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \ -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \ %endif @@ -263,8 +258,8 @@ cmake -G "Ninja" \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %ifarch armv6hl - -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ - -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ %endif %ifarch armv7hl -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \