Commit 7071d80c authored by Gianfranco Costamagna's avatar Gianfranco Costamagna

ghc: patch refresh

parent 98dc84f4
......@@ -6,9 +6,11 @@ Author: Jani Monoses <jani@ubuntu.com>
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -417,7 +417,7 @@ AC_DEFUN([GET_ARM_ISA],
Index: ghc-8.4.1/aclocal.m4
===================================================================
--- ghc-8.4.1.orig/aclocal.m4
+++ ghc-8.4.1/aclocal.m4
@@ -423,7 +423,7 @@
)],
[changequote(, )dnl
ARM_ISA=ARMv7
......
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -681,7 +681,7 @@ addFingerprints hsc_env mb_old_fingerpri
Index: ghc-8.4.1/compiler/iface/MkIface.hs
===================================================================
--- ghc-8.4.1.orig/compiler/iface/MkIface.hs
+++ ghc-8.4.1/compiler/iface/MkIface.hs
@@ -689,7 +689,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
......@@ -11,7 +13,7 @@ Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
sorted_deps,
mi_hpc iface0)
@@ -714,6 +714,9 @@ addFingerprints hsc_env mb_old_fingerpri
@@ -724,6 +724,9 @@
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
......
Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -274,7 +274,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
Index: ghc-8.4.1/aclocal.m4
===================================================================
--- ghc-8.4.1.orig/aclocal.m4
+++ ghc-8.4.1/aclocal.m4
@@ -272,12 +272,15 @@
nto-qnx)
test -z "[$]2" || eval "[$]2=OSQNXNTO"
;;
......@@ -11,9 +13,7 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
test -z "[$]2" || eval "[$]2=OSUnknown"
;;
aix)
@@ -283,6 +283,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
linux-android)
test -z "[$]2" || eval "[$]2=OSAndroid"
test -z "[$]2" || eval "[$]2=OSAIX"
;;
+ gnu)
+ test -z "[$]2" || eval "[$]2=OSHurd"
......@@ -21,19 +21,21 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
*)
echo "Unknown OS '[$]1'"
exit 1
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -88,6 +88,7 @@ data OS
Index: ghc-8.4.1/compiler/utils/Platform.hs
===================================================================
--- ghc-8.4.1.orig/compiler/utils/Platform.hs
+++ ghc-8.4.1/compiler/utils/Platform.hs
@@ -87,6 +87,7 @@
| OSHaiku
| OSQNXNTO
| OSAndroid
| OSAIX
+ | OSHurd
deriving (Read, Show, Eq)
-- | ARM Instruction Set Architecture, Extensions and ABI
@@ -139,6 +140,7 @@ osElfTarget OSHaiku = True
@@ -136,6 +137,7 @@
osElfTarget OSHaiku = True
osElfTarget OSQNXNTO = False
osElfTarget OSAndroid = True
osElfTarget OSAIX = False
+osElfTarget OSHurd = True
osElfTarget OSUnknown = False
......
......@@ -3,9 +3,11 @@ Description: Do not emit a warning if the .haddock file is missing
without the -doc package.
Author: Joachim Breitner <nomeata@debian.org>
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -1773,8 +1773,10 @@ checkPackageConfig pkg verbosity db_stac
Index: ghc-8.4.1/utils/ghc-pkg/Main.hs
===================================================================
--- ghc-8.4.1.orig/utils/ghc-pkg/Main.hs
+++ ghc-8.4.1/utils/ghc-pkg/Main.hs
@@ -1774,8 +1774,10 @@
mapM_ (checkDir True "dynamic-library-dirs") (libraryDynDirs pkg)
mapM_ (checkDir True "include-dirs") (includeDirs pkg)
mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg)
......
--- a/ghc.mk
+++ b/ghc.mk
@@ -829,7 +829,6 @@ endif
Index: ghc-8.4.1/ghc.mk
===================================================================
--- ghc-8.4.1.orig/ghc.mk
+++ ghc-8.4.1/ghc.mk
@@ -820,7 +820,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
......@@ -8,7 +10,7 @@
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
@@ -950,12 +949,8 @@ endif
@@ -953,12 +952,8 @@
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
......@@ -22,7 +24,7 @@
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
@@ -1067,7 +1062,6 @@ $(eval $(call bindist-list,.,\
@@ -1078,7 +1073,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
......
......@@ -7,9 +7,11 @@ Description: Use the stage1 binaries for install
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Last-Update: 2017-01-29
--- a/ghc.mk
+++ b/ghc.mk
@@ -963,8 +963,12 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdi
Index: ghc-8.4.1/ghc.mk
===================================================================
--- ghc-8.4.1.orig/ghc.mk
+++ ghc-8.4.1/ghc.mk
@@ -972,8 +972,12 @@
# Install packages in the right order, so that ghc-pkg doesn't complain.
# Also, install ghc-pkg first.
ifeq "$(Windows_Host)" "NO"
......
......@@ -12,9 +12,11 @@ Description: Use native x86_64 instructions on x32
See: https://ghc.haskell.org/trac/ghc/ticket/11571
.
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -917,7 +917,7 @@
Index: ghc-8.4.1/rts/RtsSymbols.c
===================================================================
--- ghc-8.4.1.orig/rts/RtsSymbols.c
+++ ghc-8.4.1/rts/RtsSymbols.c
@@ -919,7 +919,7 @@
// 64-bit support functions in libgcc.a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment