Commit d1e3f279 authored by Gianfranco Costamagna's avatar Gianfranco Costamagna
Browse files

ghc: patch refresh for armel build, but do not apply it, upload to experimental

parent a20f009f

p/ghc/debian/changelog

+7 −0
Original line number Diff line number Diff line 
ghc (8.4.1-2) experimental; urgency=medium



  * Refresh armel patch, but do not apply it, to see

    if upstream changes are enough to make it build again



 -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Apr 2018 08:58:07 +0200



ghc (8.4.1-1) experimental; urgency=medium



  * New upstream release, patch refresh

p/ghc/debian/patches/armel-revert-ghci-fixes.patch

+24 −19
Original line number Diff line number Diff line
@@ -9,16 +9,17 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel 
 armel with the help of debian/rules.

 .



--- ghc-8.2.1.orig/aclocal.m4	2017-09-17 10:46:45.000000000 +0200

+++ ghc-8.2.1/aclocal.m4	2017-09-17 11:57:40.681870101 +0200

@@ -621,16 +621,8 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],

Index: ghc-8.4.1/aclocal.m4

===================================================================

--- ghc-8.4.1.orig/aclocal.m4

+++ ghc-8.4.1/aclocal.m4

@@ -651,15 +651,8 @@

         $3="$$3 -D_HPUX_SOURCE"

         $5="$$5 -D_HPUX_SOURCE"

         ;;

-    arm*linux*)

-        # On arm/linux and arm/android, tell gcc to generate Arm

-        # instructions (ie not Thumb) and to link using the gold linker.

-        # Forcing LD to be ld.gold is done in FIND_LD m4 macro.

-        # instructions (ie not Thumb).

-        $2="$$2 -marm"

-        $3="$$3 -Wl,-z,noexecstack"

-        $4="$$4 -z noexecstack"
@@ -30,9 +31,11 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel 
         $3="$$3 -Wl,-z,noexecstack"

         $4="$$4 -z noexecstack"

         ;;

--- ghc-7.10.3.orig/libraries/ghci/GHCi/InfoTable.hsc

+++ ghc-7.10.3/libraries/ghci/GHCi/InfoTable.hsc

@@ -245,17 +245,17 @@ mkJumpToAddr dflags a = case platformArc

Index: ghc-8.4.1/libraries/ghci/GHCi/InfoTable.hsc

===================================================================

--- ghc-8.4.1.orig/libraries/ghci/GHCi/InfoTable.hsc

+++ ghc-8.4.1/libraries/ghci/GHCi/InfoTable.hsc

@@ -245,17 +245,17 @@

                  , fromIntegral ((w64 `shiftR` 32) .&. 0x0000FFFF) ]

 

     ArchARM { } ->
@@ -55,14 +58,16 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel 
                 , byte0 w32, byte1 w32, byte2 w32, byte3 w32]

 

     ArchARM64 { } ->

--- ghc-7.10.3.orig/compiler/llvmGen/LlvmCodeGen/Ppr.hs

+++ ghc-7.10.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs

@@ -52,7 +52,7 @@ moduleLayout = sdocWithPlatform $ \platform ->

         $+$ text "target triple = \"x86_64-linux-gnu\""

     Platform { platformArch = ArchARM {}, platformOS = OSLinux } ->

         text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\""

-        $+$ text "target triple = \"armv6-unknown-linux-gnueabihf\""

+        $+$ text "target triple = \"arm-unknown-linux-gnueabi\""

     Platform { platformArch = ArchARM {}, platformOS = OSAndroid } ->

         text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\""

         $+$ text "target triple = \"arm-unknown-linux-androideabi\""
 
Index: ghc-8.4.1/llvm-targets

===================================================================

--- ghc-8.4.1.orig/llvm-targets

+++ ghc-8.4.1/llvm-targets

@@ -2,7 +2,7 @@

 ,("i686-unknown-windows", ("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))

 ,("x86_64-unknown-windows", ("e-m:w-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))

 ,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))

-,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))

+,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))

 ,("armv7-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))

 ,("aarch64-unknown-linux-gnu", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))

 ,("aarch64-unknown-linux", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))

p/ghc/debian/rules

+3 −3
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ endif 
ifeq (armhf,$(DEB_HOST_ARCH))

	echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk

endif

ifeq (armel,$(DEB_HOST_ARCH))

	patch -p1 < debian/patches/armel-revert-ghci-fixes.patch

endif

#ifeq (armel,$(DEB_HOST_ARCH))

#	patch -p1 < debian/patches/armel-revert-ghci-fixes.patch

#endif

ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))

	echo "SRC_HC_OPTS     += -optc--param -optcggc-min-expand=10" >> mk/build.mk

endif