- merged 8.10.7 from PLD

[packages/ghc.git] / ghc-tld.patch

diff --git a/ghc-tld.patch b/ghc-tld.patch
index 5fe4800c74bba4ac19360ea233c122d56a5ac0bf..a911e4c0d0f960ef7f80b4b0878d33e4e56df087 100644 (file)
--- a/ghc-tld.patch
+++ b/ghc-tld.patch
@@ -8,36 +8,32 @@
 +        i386|i486|i586|i686)
              test -z "[$]2" || eval "[$]2=ArchX86"
              ;;
-         x86_64)
-@@ -185,7 +185,7 @@
+         x86_64|amd64)
+@@ -229,7 +229,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
  
      checkVendor() {
          case [$]1 in
--        dec|unknown|hp|apple|next|sun|sgi|ibm)
-+        tld|dec|unknown|hp|apple|next|sun|sgi|ibm)
+-        dec|none|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld|alpine)
++        dec|none|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld|alpine|tld)
              ;;
          *)
-             echo "Unknown vendor [$]1"
---- ghc-6.12.1/libraries/terminfo/configure.ac~        2009-09-15 08:09:05.000000000 +0200
-+++ ghc-6.12.1/libraries/terminfo/configure.ac 2010-04-08 16:43:45.040705349 +0200
-@@ -13,7 +13,8 @@
-     [curses_libraries=NONE])
- 
- 
--TERMINFO_INCLUDE_DIRS=
-+TERMINFO_INCLUDE_DIRS=/usr/include/ncursesw
-+CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS"
- TERMINFO_LIB_DIRS=
- if test "x$curses_libraries" != "xNONE"; then
-   LDFLAGS="-L$curses_libraries $LDFLAGS"
---- ghc-7.2.1/driver/split/ghc-split.lprl~     2011-08-07 19:10:05.000000000 +0200
-+++ ghc-7.2.1/driver/split/ghc-split.lprl      2011-09-26 11:13:36.907176266 +0200
-@@ -225,7 +225,7 @@
-                             if $TargetPlatform =~ /-apple-darwin/m;
-     return(&process_asm_block_m68k($str))  if $TargetPlatform =~ /^m68k-/m;
-     return(&process_asm_block_sparc($str)) if $TargetPlatform =~ /^sparc-/m;
--    return(&process_asm_block_iX86($str))  if $TargetPlatform =~ /^i[34]86-/m;
-+    return(&process_asm_block_iX86($str))  if $TargetPlatform =~ /^i[3456]86-/m;
-     return(&process_asm_block_x86_64($str))  if $TargetPlatform =~ /^x86_64-/m;
-     return(&process_asm_block_alpha($str)) if $TargetPlatform =~ /^alpha-/m;
-     return(&process_asm_block_hppa($str))  if $TargetPlatform =~ /^hppa/m;
+             AC_MSG_WARN([Unknown vendor [$]1])
+--- ghc-8.10.7/utils/llvm-targets/gen-data-layout.sh.orig      2021-06-21 08:54:36.000000000 +0200
++++ ghc-8.10.7/utils/llvm-targets/gen-data-layout.sh   2022-03-17 13:21:10.641498496 +0100
+@@ -54,13 +54,16 @@
+     "aarch64-unknown-linux-gnu"
+     "aarch64-unknown-linux-musl"
+     "aarch64-unknown-linux"
++    "aarch64-tld-linux"
+     # Linux x86
+     "i386-unknown-linux-gnu"
+     "i386-unknown-linux-musl"
+     "i386-unknown-linux"
++    "i686-tld-linux"
+     "x86_64-unknown-linux-gnu"
+     "x86_64-unknown-linux-musl"
+     "x86_64-unknown-linux"
++    "x86_64-tld-linux"
+     # Linux Android
+     "x86_64-unknown-linux-android"
+     "armv7-unknown-linux-androideabi"