rpms/ghc/FC-5 ghc-6.4.1-gcc41.patch,NONE,1.1 ghc.spec,1.11,1.12

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25769

Modified Files:
	ghc.spec 
Added Files:
	ghc-6.4.1-gcc41.patch 
Log Message:
- add ghc-6.4.1-gcc41.patch to fix stage2 linking on x86_64
  (Chris Parrott, #185914)


ghc-6.4.1-gcc41.patch:

--- NEW FILE ghc-6.4.1-gcc41.patch ---
diff -urwpN ghc-6.4.1/ghc/rts/StgCRun.c ghc-6.4.1.patched/ghc/rts/StgCRun.c
--- ghc-6.4.1/ghc/rts/StgCRun.c	2005-03-30 04:01:48.000000000 -0600
+++ ghc-6.4.1.patched/ghc/rts/StgCRun.c	2006-03-21 17:13:22.000000000 -0600
@@ -179,7 +179,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg
 
 extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
 
-static void StgRunIsImplementedInAssembler(void)
+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
 {
     __asm__ volatile (
 	/*
@@ -604,7 +604,7 @@ static void StgRunIsImplementedInAssembl
 // *) The Link Register is saved to a different offset in the caller's stack frame
 //    (Linux: 4(r1), Darwin 8(r1))
 
-static void StgRunIsImplementedInAssembler(void)
+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
 {
 	__asm__ volatile (
 		"\t.globl StgRun\n"
@@ -683,7 +683,7 @@ static void StgRunIsImplementedInAssembl
 #ifdef linux_HOST_OS
 extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
 
-static void StgRunIsImplementedInAssembler(void)
+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
 {
         // r0 volatile
 	// r1 stack pointer
@@ -833,7 +833,7 @@ static void StgRunIsImplementedInAssembl
 #define LOCALS 31
 #endif
 
-static void StgRunIsImplementedInAssembler(void)
+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
 {
     __asm__ volatile(
 		".global StgRun\n"


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc.spec	2 Mar 2006 08:40:15 -0000	1.11
+++ ghc.spec	22 Mar 2006 03:32:33 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:		ghc
 Version:	6.4.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -14,13 +14,14 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ghc, sed
-Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+BuildRequires:	ghc, sed
+Buildrequires:	gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
-Buildrequires: libxslt, docbook-style-xsl, haddock
+Buildrequires:	libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
+Patch1:		ghc-6.4.1-gcc41.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q -n ghc-%{version}
+%patch1 -p1 -b .1-gcc
 
 %build
 %if !%{build_prof}
@@ -156,15 +158,19 @@
 %endif
 
 %changelog
-* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3
+* Wed Mar 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-4.fc5
+- add ghc-6.4.1-gcc41.patch from gentoo-haskell to fix stage2 linking on x86_64
+  (Chris Parrott, #185914)
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5
 - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024)
 - make ghc-doc require ghc (Michel Salim, #180449)
 
-* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2.fc5
 - turn on build_doc since haddock is now in Extras
 - no longer specify ghc version to build with (Ville Skyttä, #170176)
 
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc5
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,