/[gentoo-x86]/dev-lang/ghc/files/ghc-6.12.3-ia64-fixed-relax.patch
Gentoo

Contents of /dev-lang/ghc/files/ghc-6.12.3-ia64-fixed-relax.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Fri Jul 9 15:03:24 2010 UTC (4 years ago) by slyfox
Branch: MAIN
CVS Tags: HEAD
Marked ~ia64 (as now we have ia64 binaries for ghc)
(Portage version: 2.1.8.3/cvs/Linux x86_64)

1 commit 7b45030b81fb0588b858400c051f9f7c10ef2760
2 Author: Sergei Trofimovich <slyfox@gentoo.org>
3 Date: Tue Jul 6 11:39:18 2010 +0300
4
5 Fixing link failure of compiler on ia64 ('-Wl,' prefixed value passed directly to ld)
6
7 /usr/bin/ld -Wl,--relax -r -o dist-stage1/build/HSghc-6.10.4.o \
8 dist-stage1/build/BasicTypes.o dist-stage1/build/DataCon.o ...
9 /usr/bin/ld: unrecognized option '-Wl,--relax'
10
11 If we just drop '-Wl,' part it will not help as '-r' and '--relax' are incompatible.
12
13 Looks like '-Wl,--relax' was skipped by earlier binutils' ld as unknown option.
14 Removing ia64 specific path.
15
16 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
17
18 diff --git a/compiler/ghc.mk b/compiler/ghc.mk
19 index 6b25efa..29d3ade 100644
20 --- a/compiler/ghc.mk
21 +++ b/compiler/ghc.mk
22 @@ -337,13 +337,6 @@ ifeq "$(TargetOS_CPP)" "openbsd"
23 compiler_CONFIGURE_OPTS += --ld-options=-E
24 endif
25
26 -ifeq "$(GhcUnregisterised)" "NO"
27 -ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
28 -# needed for generating proper relocation in large binaries: trac #856
29 -compiler_CONFIGURE_OPTS += --ld-option=-Wl,--relax
30 -endif
31 -endif
32 -
33 # We need to turn on profiling either if we have been asked to
34 # (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
35 # profiling enabled (GhcProfiled = YES).

  ViewVC Help
Powered by ViewVC 1.1.20