Accepting request 147492 from devel:Factory:ARM

- disable cross-compile mode in stage2 for armv5/v7

OBS-URL: https://build.opensuse.org/request/show/147492
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=199
This commit is contained in:
Ismail Dönmez 2013-01-08 09:52:39 +00:00 committed by Git OBS Bridge
parent 927e02d231
commit a07fcecabd
2 changed files with 34 additions and 22 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 31 09:29:12 UTC 2012 - dmueller@suse.com
- disable cross-compile mode in stage2 for armv5/v7
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 20 14:51:18 UTC 2012 - idonmez@suse.com Thu Dec 20 14:51:18 UTC 2012 - idonmez@suse.com

View File

@ -174,31 +174,29 @@ mkdir Release
ln -s lib Release/lib64 ln -s lib Release/lib64
%endif %endif
%ifarch armv7l armv7hl
# This fixes the armv7 build. (Allow to run stage2 without problem)
export CFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
export CXXFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
%endif
../configure \ ../configure \
--enable-optimized \ --enable-optimized \
--disable-assertions \ --disable-assertions \
--with-optimize-option="-O0" \ --with-optimize-option="-O0" \
%ifarch armv5el armv5tel %ifarch %arm
--disable-sjlj-exceptions \ --disable-sjlj-exceptions \
--with-arch=armv5te --with-float=soft --with-mode=arm \
--disable-werror --enable-checking=release \ --disable-werror --enable-checking=release \
%ifarch armv5el armv5tel
--with-arch=armv5te --with-float=soft --with-mode=arm \
--build=armv5tel-suse-linux-gnueabi --host=armv5tel-suse-linux-gnueabi --target=armv5tel-suse-linux-gnueabi \ --build=armv5tel-suse-linux-gnueabi --host=armv5tel-suse-linux-gnueabi --target=armv5tel-suse-linux-gnueabi \
%endif %endif
%ifarch armv7l armv7hl %ifarch armv7l armv7hl
--disable-sjlj-exceptions \ --with-arch=armv7-a \
--with-arch=armv7-a --with-tune=cortex-a9 --with-float=hard --with-fpu=vfpv3-d16 --with-fpmath=vfp3 \ --with-tune=cortex-a9 \
--disable-werror --enable-checking=release \ --with-float=hard \
--with-fpu=vfpv3-d16 \
--with-abi=aapcs-vfp \
--build=armv7hl-suse-linux-gnueabi --host=armv7hl-suse-linux-gnueabi --target=armv7hl-suse-linux-gnueabi \ --build=armv7hl-suse-linux-gnueabi --host=armv7hl-suse-linux-gnueabi --target=armv7hl-suse-linux-gnueabi \
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
--with-mode=thumb \ --with-mode=thumb \
%else %else
--with-mode=arm \ --with-mode=arm \
%endif
%endif %endif
%endif %endif
--enable-targets=host --enable-targets=host
@ -217,34 +215,43 @@ ln -s lib Release+Debug/lib64
export CC=$TOPLEVEL/stage1/Release/bin/clang export CC=$TOPLEVEL/stage1/Release/bin/clang
export CXX=$TOPLEVEL/stage1/Release/bin/clang++ export CXX=$TOPLEVEL/stage1/Release/bin/clang++
%ifarch armv7l armv7hl
# This fixes the armv7 build. (Allow to run stage2 without problem)
export CFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
export CXXFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
%endif
../configure \ ../configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--enable-optimized \ --enable-optimized \
--disable-assertions \ --disable-assertions \
--enable-pic \ --enable-pic \
--disable-timestamps \ --disable-timestamps \
--enable-targets=%{_supported_archs} \
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
--with-binutils-include=/usr/include \ --with-binutils-include=/usr/include \
%endif %endif
%ifarch armv5el armv5tel %ifarch %arm
--with-optimize-option="-U_GLIBCXX_ATOMIC_BUILTINS" \ --with-optimize-option="-U_GLIBCXX_ATOMIC_BUILTINS" \
--disable-sjlj-exceptions \ --disable-sjlj-exceptions \
--with-arch=armv5te --with-float=soft --with-mode=arm \
--disable-werror --enable-checking=release \ --disable-werror --enable-checking=release \
--build=armv5tel-suse-linux-gnueabi --host=armv5tel-suse-linux-gnueabi --target=armv5tel-suse-linux-gnueabi \ %ifarch armv5el armv5tel
--with-arch=armv5te --with-float=soft --with-mode=arm \
%endif %endif
%ifarch armv7l armv7hl %ifarch armv7l armv7hl
--with-optimize-option="-U_GLIBCXX_ATOMIC_BUILTINS" \ --with-arch=armv7-a \
--disable-sjlj-exceptions \ --with-tune=cortex-a9 \
--with-arch=armv7-a --with-tune=cortex-a9 --with-float=hard --with-fpu=vfpv3-d16 --with-fpmath=vfp3 \ --with-float=hard \
--with-fpu=vfpv3-d16 \
--with-abi=aapcs-vfp \
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
--with-mode=thumb \ --with-mode=thumb \
%else %else
--with-mode=arm \ --with-mode=arm \
%endif %endif
--disable-werror --enable-checking=release \ %endif
--build=armv7hl-suse-linux-gnueabi --host=armv7hl-suse-linux-gnueabi --target=armv7hl-suse-linux-gnueabi \ --enable-targets=arm \
%else
--enable-targets=%{_supported_archs} \
%endif %endif
--with-clang-resource-dir="../%{_lib}/clang/%{_release_version}" \ --with-clang-resource-dir="../%{_lib}/clang/%{_release_version}" \
--enable-debug-symbols \ --enable-debug-symbols \