[Pkg-haskell-commits] darcs: ghc: Removing patch ghc-6.12.3-ia64-fixed-relax

[Joachim Breitner]

Sat Jan 15 07:09:18 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Removing patch ghc-6.12.3-ia64-fixed-relax
  Ignore-this: ff4ba43044b438061495f5c8a5310308
  The patch was removing some lines which are not present any more.

    R ./patches/ghc-6.12.3-ia64-fixed-relax
    M ./patches/series -1

Sat Jan 15 07:09:18 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Removing patch ghc-6.12.3-ia64-fixed-relax
  Ignore-this: ff4ba43044b438061495f5c8a5310308
  The patch was removing some lines which are not present any more.
diff -rN -u old-ghc/patches/ghc-6.12.3-ia64-fixed-relax new-ghc/patches/ghc-6.12.3-ia64-fixed-relax
--- old-ghc/patches/ghc-6.12.3-ia64-fixed-relax	2011-01-15 07:13:03.851833681 +0000
+++ new-ghc/patches/ghc-6.12.3-ia64-fixed-relax	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-commit 7b45030b81fb0588b858400c051f9f7c10ef2760
-Author: Sergei Trofimovich <slyfox at gentoo.org>
-Date:   Tue Jul 6 11:39:18 2010 +0300
-
-    Fixing link failure of compiler on ia64 ('-Wl,' prefixed value passed directly to ld)
-    
-        /usr/bin/ld -Wl,--relax -r -o dist-stage1/build/HSghc-6.10.4.o \
-                                      dist-stage1/build/BasicTypes.o dist-stage1/build/DataCon.o ...
-        /usr/bin/ld: unrecognized option '-Wl,--relax'
-    
-    If we just drop '-Wl,' part it will not help as '-r' and '--relax' are incompatible.
-    
-    Looks like '-Wl,--relax' was skipped by earlier binutils' ld as unknown option.
-    Removing ia64 specific path.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
-
-diff --git a/compiler/ghc.mk b/compiler/ghc.mk
-index 6b25efa..29d3ade 100644
---- a/compiler/ghc.mk
-+++ b/compiler/ghc.mk
-@@ -337,13 +337,6 @@ ifeq "$(TargetOS_CPP)" "openbsd"
- compiler_CONFIGURE_OPTS += --ld-options=-E
- endif
- 
--ifeq "$(GhcUnregisterised)" "NO"
--ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
--# needed for generating proper relocation in large binaries: trac #856
--compiler_CONFIGURE_OPTS += --ld-option=-Wl,--relax
--endif
--endif
--
- # We need to turn on profiling either if we have been asked to
- # (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
- # profiling enabled (GhcProfiled = YES).
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 07:13:03.851833681 +0000
+++ new-ghc/patches/series	2011-01-15 07:13:03.879835156 +0000
@@ -3,7 +3,6 @@
 kfreebsd-_gnu_source-565818
 getallinfo-nothing-ghci-566331
 haddock-hardcode-ghc-paths
-ghc-6.12.3-ia64-fixed-relax
 ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper
 ghc-6.12.3-ia64-storage-manager-fix
 use-debian-gen_contents_index