revert dropping ghc-debian-ARM-VFPv3D16.patch and define __ARM_PCS_VFP in build.mk
This commit is contained in:
parent
759e833d8b
commit
02d6827bb4
9
ghc.spec
9
ghc.spec
@ -99,7 +99,7 @@ Patch9: Cabal-fix-dynamic-exec-for-TH.patch
|
|||||||
Patch10: fix-ARM-s-StgCRun-clobbered-register-list-for-both-A.patch
|
Patch10: fix-ARM-s-StgCRun-clobbered-register-list-for-both-A.patch
|
||||||
Patch11: fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis.patch
|
Patch11: fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis.patch
|
||||||
# Debian armhf fixes
|
# Debian armhf fixes
|
||||||
#Patch12: ghc-debian-ARM-VFPv3D16.patch
|
Patch12: ghc-debian-ARM-VFPv3D16.patch
|
||||||
Patch13: ghc-debian-armhf_llvm_abi.patch
|
Patch13: ghc-debian-armhf_llvm_abi.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -219,7 +219,7 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
|
|||||||
%ifarch armv7hl armv5tel
|
%ifarch armv7hl armv5tel
|
||||||
%patch10 -p1 -b .arm1
|
%patch10 -p1 -b .arm1
|
||||||
%patch11 -p1 -b .arm2
|
%patch11 -p1 -b .arm2
|
||||||
#%%patch12 -p1 -b .arm
|
%patch12 -p1 -b .arm
|
||||||
%patch13 -p1 -b .arm
|
%patch13 -p1 -b .arm
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -237,9 +237,8 @@ BUILD_DOCBOOK_HTML = NO
|
|||||||
%if %{undefined without_hscolour}
|
%if %{undefined without_hscolour}
|
||||||
HSCOLOUR_SRCS = NO
|
HSCOLOUR_SRCS = NO
|
||||||
%endif
|
%endif
|
||||||
## should be unnecessary
|
%ifarch armv7hl
|
||||||
%ifarch %{unregisterised_archs}
|
SRC_HC_OPTS += -D__ARM_PCS_VFP"
|
||||||
#GhcUnregisterised=YES
|
|
||||||
%endif
|
%endif
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user