[DHG_packages] 01/08: ghc: remove patches addressed upstream, preparing for ghc 8.0.2
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Mon Jun 19 08:17:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository DHG_packages.
commit b698c38b26f743f3e0a4479b725a6a7e279b463e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Jun 19 08:54:56 2017 +0200
ghc: remove patches addressed upstream, preparing for ghc 8.0.2
---
p/ghc/debian/patches/R_X86_64_REX_GOTPCRELX | 45 -----
p/ghc/debian/patches/add-missing-MO_WriteBarrier | 38 ----
p/ghc/debian/patches/find-tycon-panic | 40 ----
p/ghc/debian/patches/fix-ppc-lwa-generation | 64 -------
p/ghc/debian/patches/get-linker-flags-correctly | 43 -----
p/ghc/debian/patches/no-pie | 230 -----------------------
p/ghc/debian/patches/series | 7 -
p/ghc/debian/patches/smp-arm-fix.patch | 11 --
8 files changed, 478 deletions(-)
diff --git a/p/ghc/debian/patches/R_X86_64_REX_GOTPCRELX b/p/ghc/debian/patches/R_X86_64_REX_GOTPCRELX
deleted file mode 100644
index a0f1dd1..0000000
--- a/p/ghc/debian/patches/R_X86_64_REX_GOTPCRELX
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0d963caf40da4391028a3beb95b5082c87985e7d Mon Sep 17 00:00:00 2001
-From: Tamar Christina <tamar at zhox.com>
-Date: Sun, 5 Jun 2016 09:59:05 +0200
-Subject: [PATCH] Add relocation type R_X86_64_REX_GOTPCRELX
-
-Summary:
-Adding support for the `R_X86_64_REX_GOTPCRELX` relocation type.
-This relocation is treated by the linker the same as the `R_X86_64_GOTPCRELX` type
-`G + GOT + A - P` to generate relative offsets to the GOT.
-The `REX` prefix has no influence in this stage.
-
-This is based on https://github.com/hjl-tools/x86-psABI/wiki/x86-64-psABI-r252.pdf
-
-Test Plan: ./validate
-
-Reviewers: erikd, austin, bgamari, simonmar
-
-Reviewed By: erikd
-
-Subscribers: thomie, #ghc_windows_task_force
-
-Differential Revision: https://phabricator.haskell.org/D2303
-
-GHC Trac Issues: #12147
----
- rts/Linker.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/rts/Linker.c
-+++ b/rts/Linker.c
-@@ -5855,7 +5855,13 @@
- *(Elf64_Sword *)P = (Elf64_Sword)value;
- #endif
- break;
--
-+/* These two relocations were introduced in glibc 2.23 and binutils 2.26.
-+ But in order to use them the system which compiles the bindist for GHC needs
-+ to have glibc >= 2.23. So only use them if they're defined. */
-+#if defined(R_X86_64_REX_GOTPCRELX) && defined(R_X86_64_GOTPCRELX)
-+ case R_X86_64_REX_GOTPCRELX:
-+ case R_X86_64_GOTPCRELX:
-+#endif
- case R_X86_64_GOTPCREL:
- {
- StgInt64 gotAddress = (StgInt64) &makeSymbolExtra(oc, ELF_R_SYM(info), S)->addr;
diff --git a/p/ghc/debian/patches/add-missing-MO_WriteBarrier b/p/ghc/debian/patches/add-missing-MO_WriteBarrier
deleted file mode 100644
index 0d5ab74..0000000
--- a/p/ghc/debian/patches/add-missing-MO_WriteBarrier
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Ben Gamari <bgamari.foss at gmail.com>
-Date: Tue, 30 Aug 2016 21:08:05 +0000 (-0400)
-Subject: StgCmmPrim: Add missing MO_WriteBarrier
-X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/7053019e7b04842dd7364039381d8c4c069489a2
-
-StgCmmPrim: Add missing MO_WriteBarrier
-
-Test Plan: Good question
-
-Reviewers: austin, trommler, simonmar, rrnewton
-
-Reviewed By: simonmar
-
-Subscribers: RyanGlScott, thomie
-
-Differential Revision: https://phabricator.haskell.org/D2495
-
-GHC Trac Issues: #12469
-
-(cherry picked from commit d40d6df74a9fca382a84709ac9bc862897fbec18)
----
-
---- a/compiler/codeGen/StgCmmPrim.hs
-+++ b/compiler/codeGen/StgCmmPrim.hs
-@@ -310,8 +310,11 @@
- emitPrimOp dflags [res] ReadMutVarOp [mutv]
- = emitAssign (CmmLocal res) (cmmLoadIndexW dflags mutv (fixedHdrSizeW dflags) (gcWord dflags))
-
--emitPrimOp dflags [] WriteMutVarOp [mutv,var]
-- = do emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var
-+emitPrimOp dflags res@[] WriteMutVarOp [mutv,var]
-+ = do -- Without this write barrier, other CPUs may see this pointer before
-+ -- the writes for the closure it points to have occurred.
-+ emitPrimCall res MO_WriteBarrier []
-+ emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var
- emitCCall
- [{-no results-}]
- (CmmLit (CmmLabel mkDirty_MUT_VAR_Label))
diff --git a/p/ghc/debian/patches/find-tycon-panic b/p/ghc/debian/patches/find-tycon-panic
deleted file mode 100644
index 968dbc3..0000000
--- a/p/ghc/debian/patches/find-tycon-panic
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Adam Gundry <adam at well-typed.com>
-Subject: Avoid find_tycon panic if datacon is not in scope
-
-When using TH to splice expressions involving record field construction,
-the parent datacon may not be in scope. We shouldn't panic about this,
-because we will be renaming Exact RdrNames which don't require any
-disambiguation.
-
-Reviewers: austin, bgamari
-Reviewed By: bgamari
-Differential Revision: https://phabricator.haskell.org/D2321
-GHC Trac Issues: #12130
-
-Origin: upstream, https://git.haskell.org/ghc.git/commitdiff/694e0f3a08030
-
-Index: b/compiler/rename/RnPat.hs
-===================================================================
---- a/compiler/rename/RnPat.hs
-+++ b/compiler/rename/RnPat.hs
-@@ -636,7 +636,7 @@ rnHsRecFields ctxt mk_arg (HsRecFields {
- find_tycon :: GlobalRdrEnv -> Name {- DataCon -} -> Maybe Name {- TyCon -}
- -- Return the parent *type constructor* of the data constructor
- -- (that is, the parent of the data constructor),
-- -- or 'Nothing' if it is a pattern synonym.
-+ -- or 'Nothing' if it is a pattern synonym or not in scope.
- -- That's the parent to use for looking up record fields.
- find_tycon env con
- | Just (AConLike (RealDataCon dc)) <- wiredInNameTyThing_maybe con
-@@ -648,8 +648,9 @@ rnHsRecFields ctxt mk_arg (HsRecFields {
- ParentIs p -> Just p
- _ -> Nothing
-
-- | otherwise
-- = pprPanic "find_tycon" (ppr con $$ ppr (lookupGRE_Name env con))
-+ | otherwise = Nothing
-+ -- This can happen if the datacon is not in scope
-+ -- and we are in a TH splice (Trac #12130)
-
- dup_flds :: [[RdrName]]
- -- Each list represents a RdrName that occurred more than once
diff --git a/p/ghc/debian/patches/fix-ppc-lwa-generation b/p/ghc/debian/patches/fix-ppc-lwa-generation
deleted file mode 100644
index 678004f..0000000
--- a/p/ghc/debian/patches/fix-ppc-lwa-generation
+++ /dev/null
@@ -1,64 +0,0 @@
-From ce3370e06165690e79a8eb22e5229b515157e00f Mon Sep 17 00:00:00 2001
-From: Peter Trommler <ptrommler at acm.org>
-Date: Sat, 1 Oct 2016 17:56:31 -0400
-Subject: [PATCH] PPC/CodeGen: fix lwa instruction generation
-
-Opcode lwa is a 64-bit opcode and allows a DS-form only. This patch
-generates lwa opcodes only when the offset is a multiple of 4.
-
-Fixes #12621
-
-Test Plan: validate
-
-Reviewers: erikd, hvr, simonmar, austin, bgamari
-
-Reviewed By: bgamari
-
-Subscribers: thomie
-
-Differential Revision: https://phabricator.haskell.org/D2547
-
-GHC Trac Issues: #12621
----
- compiler/nativeGen/PPC/CodeGen.hs | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/compiler/nativeGen/PPC/CodeGen.hs
-+++ b/compiler/nativeGen/PPC/CodeGen.hs
-@@ -9,9 +9,8 @@
- -----------------------------------------------------------------------------
-
- -- This is a big module, but, if you pay attention to
---- (a) the sectioning, (b) the type signatures, and
---- (c) the #if blah_TARGET_ARCH} things, the
---- structure should not be too overwhelming.
-+-- (a) the sectioning, and (b) the type signatures,
-+-- the structure should not be too overwhelming.
-
- module PPC.CodeGen (
- cmmTopCodeGen,
-@@ -471,7 +470,8 @@
- return (Any II64 (\dst -> addr_code `snocOL` LD II32 dst addr))
-
- getRegister' _ (CmmMachOp (MO_SS_Conv W32 W64) [CmmLoad mem _]) = do
-- Amode addr addr_code <- getAmode D mem
-+ -- lwa is DS-form. See Note [Power instruction format]
-+ Amode addr addr_code <- getAmode DS mem
- return (Any II64 (\dst -> addr_code `snocOL` LA II32 dst addr))
-
- getRegister' dflags (CmmMachOp mop [x]) -- unary MachOps
-@@ -733,6 +733,14 @@
- ... (tmp) ...
- -}
-
-+{- Note [Power instruction format]
-+In some instructions the 16 bit offset must be a multiple of 4, i.e.
-+the two least significant bits mus be zero. The "Power ISA" specification
-+calls these instruction formats "DS-FORM" and the instructions with
-+arbitrary 16 bit offsets are "D-FORM".
-+
-+The Power ISA specification document can be obtained from www.power.org.
-+-}
- data InstrForm = D | DS
-
- getAmode :: InstrForm -> CmmExpr -> NatM Amode
diff --git a/p/ghc/debian/patches/get-linker-flags-correctly b/p/ghc/debian/patches/get-linker-flags-correctly
deleted file mode 100644
index 4c33bd9..0000000
--- a/p/ghc/debian/patches/get-linker-flags-correctly
+++ /dev/null
@@ -1,43 +0,0 @@
-From c30b179a73d9fd3f6edcdda5e881523cd6edd46a Mon Sep 17 00:00:00 2001
-From: Anders Kaseorg <andersk at mit.edu>
-Date: Thu, 19 May 2016 03:18:02 -0400
-Subject: [PATCH] =?utf8?q?Get=20linker=20flags=20correctly=20from=20GHC=20?=
- =?utf8?q?=E2=89=A5=207.8?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-GHC 7.8 renamed "Gcc Linker flags" to "C compiler link flags" and "Ld
-Linker flags" to "ld flags"
-(https://ghc.haskell.org/trac/ghc/ticket/4862).
-
-Without this corresponding fix in Cabal, the old-time package fails to
-compile on Ubuntu yakkety amd64, where the system GCC now defaults to
--pie and GHC has
-
- $ ghc --info | grep -i pie
- ,("C compiler flags","-fno-PIE -fno-stack-protector")
- ,("C compiler link flags","-no-pie")
- ,("ld flags","-no-pie")
-
-Signed-off-by: Anders Kaseorg <andersk at mit.edu>
-(cherry picked from commit c993a0c6660aa10d8c79ed0cc4961c59acfc91c8)
----
- libraries/Cabal/Cabal/Distribution/Simple/GHC/Internal.hs | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/libraries/Cabal/Cabal/Distribution/Simple/GHC/Internal.hs
-+++ b/libraries/Cabal/Cabal/Distribution/Simple/GHC/Internal.hs
-@@ -139,8 +139,10 @@
- mbStripLocation = M.lookup "strip command" ghcInfo
-
- ccFlags = getFlags "C compiler flags"
-- gccLinkerFlags = getFlags "Gcc Linker flags"
-- ldLinkerFlags = getFlags "Ld Linker flags"
-+ -- GHC 7.8 renamed "Gcc Linker flags" to "C compiler link flags"
-+ -- and "Ld Linker flags" to "ld flags" (GHC #4862).
-+ gccLinkerFlags = getFlags "Gcc Linker flags" ++ getFlags "C compiler link flags"
-+ ldLinkerFlags = getFlags "Ld Linker flags" ++ getFlags "ld flags"
-
- -- It appears that GHC 7.6 and earlier encode the tokenized flags as a
- -- [String] in these settings whereas later versions just encode the flags as
diff --git a/p/ghc/debian/patches/no-pie b/p/ghc/debian/patches/no-pie
deleted file mode 100644
index 47fdde5..0000000
--- a/p/ghc/debian/patches/no-pie
+++ /dev/null
@@ -1,230 +0,0 @@
-Description: Pass -no-pie to GCC
- Certain distributions (e.g. Debian and Ubuntu) have enabled PIE be
- default in their GCC packaging. This breaks our abuse of GCC as a linker
- which requires that we pass -Wl,-r, which is incompatible with
- PIE (since the former implies that we are generating a relocatable
- object file and the latter an executable).
-Author: Ben Gamari <bgamari.foss at gmail.com>
-Origin: upstream, https://phabricator.haskell.org/D2693
-Bug: https://ghc.haskell.org/trac/ghc/ticket/12759
-Bug-Debian: https://bugs.debian.org/712228
-
-Index: b/aclocal.m4
-===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -502,12 +502,14 @@ AC_DEFUN([FP_SETTINGS],
- fi
- SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2"
- SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2"
-+ SettingsCCompilerSupportsNoPie="$CONF_GCC_SUPPORTS_NO_PIE"
- SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2"
- AC_SUBST(SettingsCCompilerCommand)
- AC_SUBST(SettingsHaskellCPPCommand)
- AC_SUBST(SettingsHaskellCPPFlags)
- AC_SUBST(SettingsCCompilerFlags)
- AC_SUBST(SettingsCCompilerLinkFlags)
-+ AC_SUBST(SettingsCCompilerSupportsNoPie)
- AC_SUBST(SettingsLdCommand)
- AC_SUBST(SettingsLdFlags)
- AC_SUBST(SettingsArCommand)
-@@ -1254,6 +1256,25 @@ AC_SUBST(GccIsClang)
- rm -f conftest.txt
- ])
-
-+# FP_GCC_SUPPORTS_NO_PIE
-+# ----------------------
-+# Does gcc support the -no-pie option? If so we should pass it to gcc when
-+# joining objects since -pie may be enabled by default.
-+AC_DEFUN([FP_GCC_SUPPORTS_NO_PIE],
-+[
-+ AC_REQUIRE([AC_PROG_CC])
-+ AC_MSG_CHECKING([whether GCC supports -no-pie])
-+ echo 'int main() { return 0; }' > conftest.c
-+ if ${CC-cc} -o conftest -no-pie conftest.c > /dev/null 2>&1; then
-+ CONF_GCC_SUPPORTS_NO_PIE=YES
-+ AC_MSG_RESULT([yes])
-+ else
-+ CONF_GCC_SUPPORTS_NO_PIE=NO
-+ AC_MSG_RESULT([no])
-+ fi
-+ rm -f conftest.c conftest.o conftest
-+])
-+
- dnl Small feature test for perl version. Assumes PerlCmd
- dnl contains path to perl binary.
- dnl
-Index: b/compiler/main/DriverPipeline.hs
-===================================================================
---- a/compiler/main/DriverPipeline.hs
-+++ b/compiler/main/DriverPipeline.hs
-@@ -1850,6 +1850,11 @@ linkBinary' staticLink dflags o_files de
- ++ map SysTools.Option (
- []
-
-+ -- See Note [No PIE eating when linking]
-+ ++ (if sGccSupportsNoPie mySettings
-+ then ["-no-pie"]
-+ else [])
-+
- -- Permit the linker to auto link _symbol to _imp_symbol.
- -- This lets us link against DLLs without needing an "import library".
- ++ (if platformOS platform == OSMinGW32
-@@ -2147,6 +2152,11 @@ joinObjectFiles dflags o_files output_fn
- SysTools.Option "-nostdlib",
- SysTools.Option "-Wl,-r"
- ]
-+ -- See Note [No PIE eating while linking] in SysTools
-+ ++ (if sGccSupportsNoPie mySettings
-+ then [SysTools.Option "-no-pie"]
-+ else [])
-+
- ++ (if any (cc ==) [Clang, AppleClang, AppleClang51]
- then []
- else [SysTools.Option "-nodefaultlibs"])
-Index: b/compiler/main/DynFlags.hs
-===================================================================
---- a/compiler/main/DynFlags.hs
-+++ b/compiler/main/DynFlags.hs
-@@ -943,6 +943,7 @@ data Settings = Settings {
- sLdSupportsBuildId :: Bool,
- sLdSupportsFilelist :: Bool,
- sLdIsGnuLd :: Bool,
-+ sGccSupportsNoPie :: Bool,
- -- commands for particular phases
- sPgm_L :: String,
- sPgm_P :: (String,[Option]),
-Index: b/compiler/main/SysTools.hs
-===================================================================
---- a/compiler/main/SysTools.hs
-+++ b/compiler/main/SysTools.hs
-@@ -252,6 +252,7 @@ initSysTools mbMinusB
- -- to make that possible, so for now you can't.
- gcc_prog <- getSetting "C compiler command"
- gcc_args_str <- getSetting "C compiler flags"
-+ gccSupportsNoPie <- getBooleanSetting "C compiler supports -no-pie"
- cpp_prog <- getSetting "Haskell CPP command"
- cpp_args_str <- getSetting "Haskell CPP flags"
- let unreg_gcc_args = if targetUnregisterised
-@@ -344,6 +345,7 @@ initSysTools mbMinusB
- sLdSupportsBuildId = ldSupportsBuildId,
- sLdSupportsFilelist = ldSupportsFilelist,
- sLdIsGnuLd = ldIsGnuLd,
-+ sGccSupportsNoPie = gccSupportsNoPie,
- sProgramName = "ghc",
- sProjectVersion = cProjectVersion,
- sPgm_L = unlit_path,
-@@ -1601,6 +1603,15 @@ linesPlatform xs =
-
- #endif
-
-+{-
-+Note [No PIE eating while linking]
-+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+As of 2016 some Linux distributions (e.g. Debian) have started enabling -pie by
-+default in their gcc builds. This is incompatible with -r as it implies that we
-+are producing an executable. Consequently, we must manually pass -no-pie to gcc
-+when joining object files or linking dynamic libraries. See #12759.
-+-}
-+
- linkDynLib :: DynFlags -> [String] -> [UnitId] -> IO ()
- linkDynLib dflags0 o_files dep_packages
- = do
-@@ -1766,6 +1777,10 @@ linkDynLib dflags0 o_files dep_packages
- ++ [ Option "-o"
- , FileOption "" output_fn
- ]
-+ -- See Note [No PIE eating when linking]
-+ ++ (if sGccSupportsNoPie (settings dflags)
-+ then [Option "-no-pie"]
-+ else [])
- ++ map Option o_files
- ++ [ Option "-shared" ]
- ++ map Option bsymbolicFlag
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -665,6 +665,7 @@ SettingsPerlCommand
- SettingsArCommand
- SettingsLdFlags
- SettingsLdCommand
-+SettingsCCompilerSupportsNoPie
- SettingsCCompilerLinkFlags
- SettingsCCompilerFlags
- SettingsHaskellCPPFlags
-@@ -7976,6 +7977,23 @@ GccVersion=$fp_cv_gcc_version
-
-
-
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC supports -no-pie" >&5
-+$as_echo_n "checking whether GCC supports -no-pie... " >&6; }
-+ echo 'int main() { return 0; }' > conftest.c
-+ if ${CC-cc} -o conftest -no-pie conftest.c > /dev/null 2>&1; then
-+ CONF_GCC_SUPPORTS_NO_PIE=YES
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ CONF_GCC_SUPPORTS_NO_PIE=NO
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ fi
-+ rm -f conftest.c conftest.o conftest
-+
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler is clang" >&5
- $as_echo_n "checking whether C compiler is clang... " >&6; }
- $CC -x c /dev/null -dM -E > conftest.txt 2>&1
-@@ -9337,10 +9355,12 @@ fi
- fi
- SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2"
- SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2"
-+ SettingsCCompilerSupportsNoPie="$CONF_GCC_SUPPORTS_NO_PIE"
- SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2"
-
-
-
-+
-
-
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -647,6 +647,9 @@ dnl If gcc, make sure it's at least
- dnl
- FP_GCC_VERSION
-
-+dnl ** See whether gcc supports -no-pie
-+FP_GCC_SUPPORTS_NO_PIE
-+
- dnl ** look to see if we have a C compiler using an llvm back end.
- dnl
- FP_CC_LLVM_BACKEND
-Index: b/distrib/configure.ac.in
-===================================================================
---- a/distrib/configure.ac.in
-+++ b/distrib/configure.ac.in
-@@ -103,6 +103,7 @@ if test "x$BinDistNeedsLibdw" = "xyes" ;
- fi
-
- FP_GCC_VERSION
-+FP_GCC_SUPPORTS_NO_PIE
- AC_PROG_CPP
-
- FP_PROG_LD_IS_GNU
-Index: b/settings.in
-===================================================================
---- a/settings.in
-+++ b/settings.in
-@@ -2,6 +2,7 @@
- ("C compiler command", "@SettingsCCompilerCommand@"),
- ("C compiler flags", "@SettingsCCompilerFlags@"),
- ("C compiler link flags", "@SettingsCCompilerLinkFlags@"),
-+ ("C compiler supports -no-pie", "@SettingsCCompilerSupportsNoPie@"),
- ("Haskell CPP command","@SettingsHaskellCPPCommand@"),
- ("Haskell CPP flags","@SettingsHaskellCPPFlags@"),
- ("ld command", "@SettingsLdCommand@"),
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index e90f3de..869c987 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -5,13 +5,6 @@ hurd.diff
buildpath-abi-stability.patch
reproducible-tmp-names
do-not-use-SHELL
-add-missing-MO_WriteBarrier
-no-pie
-find-tycon-panic
compiler-cmm-PprC-sparc-alignment.patch
-get-linker-flags-correctly
x32-use-native-x86_64-insn.patch
-fix-ppc-lwa-generation
osdecommitmemory-compat.patch
-smp-arm-fix.patch
-R_X86_64_REX_GOTPCRELX
diff --git a/p/ghc/debian/patches/smp-arm-fix.patch b/p/ghc/debian/patches/smp-arm-fix.patch
deleted file mode 100644
index 7c4fea8..0000000
--- a/p/ghc/debian/patches/smp-arm-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -187,7 +187,7 @@
- # includes/stg/SMP.h
- ifeq "$(TargetArch_CPP)" "arm"
- # We don't support load/store barriers pre-ARMv7. See #10433.
--ArchSupportsSMP="$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)"
-+ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)
- else
- ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc powerpc64 powerpc64le aarch64)))
- endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list