[Git][haskell-team/DHG_packages][experimental] ghc: drop old powerpcspe patch
Gianfranco Costamagna
gitlab at salsa.debian.org
Tue Jun 5 14:38:42 BST 2018
Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages
Commits:
d1d5fff3 by Gianfranco Costamagna at 2018-06-05T15:38:24+02:00
ghc: drop old powerpcspe patch
- - - - -
2 changed files:
- p/ghc/debian/changelog
- − p/ghc/debian/patches/powerpcspe-disable-FPU-code.patch
Changes:
=====================================
p/ghc/debian/changelog
=====================================
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,10 @@
+ghc (8.4.3-2) UNRELEASED; urgency=medium
+
+ * Remove old and non-applied anymore powerpcspe-disable-FPU-code.patch.
+ (Closes: #900817)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 05 Jun 2018 15:37:46 +0200
+
ghc (8.4.3-1) experimental; urgency=medium
* New upstream version.
=====================================
p/ghc/debian/patches/powerpcspe-disable-FPU-code.patch deleted
=====================================
--- a/p/ghc/debian/patches/powerpcspe-disable-FPU-code.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Disable FPU code on powerpspe
- powerpcspe CPUs don't have an FPU, so the FPU PPC assembly
- code has to be disabled on this architecture.
- See: https://ghc.haskell.org/trac/ghc/ticket/12075
- .
-
---- ghc-8.0.1.orig/aclocal.m4
-+++ ghc-8.0.1/aclocal.m4
-@@ -185,6 +185,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
- test -z "[$]2" || eval "[$]2=ArchX86_64"
- ;;
- powerpc)
-+ FP_CHECK_FOR_SOFT_FLOAT_POWERPC()
- test -z "[$]2" || eval "[$]2=ArchPPC"
- ;;
- powerpc64)
-@@ -458,6 +459,25 @@ AC_DEFUN([GET_ARM_ISA],
- AC_SUBST(ARM_ISA)
- ])
-
-+# CHECK_FOR_SOFT_FLOAT_POWERPC
-+# ----------------------------------
-+# Check whether we have hardware floating point support. See #12075
-+AC_DEFUN([FP_CHECK_FOR_SOFT_FLOAT_POWERPC],
-+[
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [],
-+ [#if defined(__NO_FPRS__)
-+ softfloat
-+ #else
-+ return 0;
-+ #endif
-+ ])],
-+ [value=NO],
-+ [value=YES])
-+
-+ AC_DEFINE(powerpc_HOST_ARCH_SOFT_FLOAT, $value, [soft-float PowerPC])
-+])
-
- # FP_SETTINGS
- # ----------------------------------
---- ghc-8.0.1.orig/mk/project.mk.in
-+++ ghc-8.0.1/mk/project.mk.in
-@@ -162,3 +162,6 @@ GHC_LLVM_AFFECTED_BY_9439 = @GHC_LLVM_AF
- ifeq "$(TargetArch_CPP)" "arm"
- ARM_ISA=@ARM_ISA@
- endif
-+ifeq "$(TargetArch_CPP)" "powerpc"
-+POWERPC_SOFT_FLOAT=@powerpc_HOST_ARCH_SOFT_FLOAT@
-+endif
---- ghc-8.0.1.orig/rts/ghc.mk
-+++ ghc-8.0.1/rts/ghc.mk
-@@ -55,9 +55,12 @@ rts_S_SRCS += rts/AdjustorAsm.S
- endif
- # this matches substrings of powerpc64le, including "powerpc" and "powerpc64"
- ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" ""
-+# and this matches soft-float PPC (#12075)
-+ifneq "$(POWERPC_NO_FPRS)" "YES"
- rts_S_SRCS += rts/StgCRunAsm.S
- endif
- endif
-+endif
-
- ifeq "$(GhcUnregisterised)" "YES"
- GENAPPLY_OPTS = -u
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/d1d5fff3b5e2e9152f6552fc678c508a40fa75ce
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/d1d5fff3b5e2e9152f6552fc678c508a40fa75ce
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180605/fce83e93/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list