Accepting request 179941 from home:namtrac:branches:devel:tools:compiler

- Fix ARM v5/v7 builds

OBS-URL: https://build.opensuse.org/request/show/179941
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=224
This commit is contained in:
Ismail Dönmez 2013-06-19 12:42:23 +00:00 committed by Git OBS Bridge
parent f549f14b5c
commit abea2dabb7
3 changed files with 40 additions and 12 deletions

23
arm-config.guess.patch Normal file
View File

@ -0,0 +1,23 @@
Index: llvm-3.3/autoconf/config.guess
===================================================================
--- llvm-3.3.orig/autoconf/config.guess
+++ llvm-3.3/autoconf/config.guess
@@ -885,13 +885,11 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
- fi
+ if uname -a | grep -q "armv7"; then
+ echo armv7hl-suse-linux-gnueabi
+ else
+ echo armv5tel-suse-linux-gnueabi
+ fi
fi
exit ;;
avr32*:Linux:*:*)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 19 12:41:30 UTC 2013 - idonmez@suse.com
- Fix ARM v5/v7 builds
-------------------------------------------------------------------
Tue Jun 18 13:42:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de

View File

@ -45,6 +45,7 @@ Patch6: arm_suse_support.diff
Patch7: disable_neon_in_armv7.diff
# PATCH-FIX-OPENSUSE unreachable-code.patch -- Unreachable code warning triggered on SLE
Patch8: unreachable-code.patch
Patch9: arm-config.guess.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@ -140,6 +141,7 @@ This package contains vim plugins for LLVM like syntax highlighting.
%endif
%ifarch %arm
%patch6 -p1
%patch9 -p1
%endif
%ifarch armv7l armv7hl
%patch7 -p0
@ -165,24 +167,18 @@ pushd stage1
cmake -G "Unix Makefiles" \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_ASSERTIONS=OFF \
-DLLVM_ENABLE_PIC=ON \
%ifarch %arm
%ifarch armv5el armv5tel
%endif
%ifarch armv7l armv7hl
%endif
-DLLVM_TARGETS_TO_BUILD=ARM \
%else
-DCMAKE_C_FLAGS="-O0" \
-DCMAKE_CXX_FLAGS="-O0" \
-DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
%endif
-DCMAKE_C_FLAGS="-O0" \
-DCMAKE_CXX_FLAGS="-O0" \
-DLLVM_TARGET_ARCH=host \
../
..
make %{?_smp_mflags} clang
@ -194,7 +190,11 @@ export CXX=$TOPLEVEL/stage1/bin/clang++
cmake -G "Unix Makefiles" \
-DBUILD_SHARED_LIBS=ON \
%ifarch %arm ppc64
-DCMAKE_BUILD_TYPE=Release \
%else
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
%ifarch armv7l armv7hl
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
@ -217,9 +217,9 @@ cmake -G "Unix Makefiles" \
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{_experimental_archs} \
%endif
-DLLVM_BUILD_TESTS=ON \
../
..
make %{?_smp_mflags} REQUIRES_RTTI=1
make %{?_smp_mflags}
%check
cd stage2