diff options
author | Duncan Coutts <dcoutts@gentoo.org> | 2007-07-10 23:37:10 +0000 |
---|---|---|
committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-07-10 23:37:10 +0000 |
commit | c0da06c1c75bfcdcd6a2a712166a13d528ddcf1d (patch) | |
tree | 2923ef47b614fc7eb319bc69f282068e06c560b2 /dev-lang | |
parent | whitespace (diff) | |
download | gentoo-2-c0da06c1c75bfcdcd6a2a712166a13d528ddcf1d.tar.gz gentoo-2-c0da06c1c75bfcdcd6a2a712166a13d528ddcf1d.tar.bz2 gentoo-2-c0da06c1c75bfcdcd6a2a712166a13d528ddcf1d.zip |
Fix sparc "norelax" patch.
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/ghc/files/ghc-6.5-norelax.patch | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 2331ce8a6a60..b3114d6e01fb 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.125 2007/07/10 17:16:49 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.126 2007/07/10 23:37:10 dcoutts Exp $ + + 10 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> + files/ghc-6.5-norelax.patch: + Fix sparc "norelax" patch. 10 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> -files/ghc-6.2.hardened.patch, -files/ghc-6.4.1-configure.patch, diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch index c11612df9d94..1941757b19f3 100644 --- a/dev-lang/ghc/files/ghc-6.5-norelax.patch +++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch @@ -5,10 +5,10 @@ diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/Driv let ld_r args = SysTools.runLink dflags ([ SysTools.Option "-nostdlib", SysTools.Option "-nodefaultlibs", -+ #ifdef sparc_TARGET_ARCH ++#ifdef sparc_TARGET_ARCH + -- options '--relax' and '-r' are incompatible + SysTools.Option "-mno-relax", -+ #endif ++#endif SysTools.Option "-Wl,-r", SysTools.Option ld_x_flag, SysTools.Option "-o", |