rpms/gc/devel gc-7.1-gcinit.patch, NONE, 1.1 gc-7.1-sparc.patch, NONE, 1.1 gc.spec, 1.35, 1.36 gc-7.0-gcinit.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31823

Modified Files:
	gc.spec 
Added Files:
	gc-7.1-gcinit.patch gc-7.1-sparc.patch 
Removed Files:
	gc-7.0-gcinit.patch 
Log Message:
* Wed Oct 15 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-5
- forward-port patches (gcinit, sparc)


gc-7.1-gcinit.patch:

--- NEW FILE gc-7.1-gcinit.patch ---
diff -up gc-7.1/thread_local_alloc.c.gcinit gc-7.1/thread_local_alloc.c
--- gc-7.1/thread_local_alloc.c.gcinit	2007-10-24 19:22:37.000000000 -0500
+++ gc-7.1/thread_local_alloc.c	2008-10-15 07:13:45.000000000 -0500
@@ -141,6 +141,9 @@ void * GC_malloc(size_t bytes)
     void *result;
     void **tiny_fl;
 
+    if (!GC_is_initialized)
+      GC_init();
+
 #   if !defined(USE_PTHREAD_SPECIFIC) && !defined(USE_WIN32_SPECIFIC)
       GC_key_t k = GC_thread_key;
       if (EXPECT(0 == k, 0)) {
diff -up gc-7.1/malloc.c.gcinit gc-7.1/malloc.c
--- gc-7.1/malloc.c.gcinit	2008-03-10 00:33:41.000000000 -0500
+++ gc-7.1/malloc.c	2008-10-15 07:12:31.000000000 -0500
@@ -263,6 +263,9 @@ void * GC_generic_malloc(size_t lb, int 
     size_t lg;
     DCL_LOCK_STATE;
 
+    if (!GC_is_initialized)
+	GC_init();
+
     if(SMALL_OBJ(lb)) {
 	lg = GC_size_map[lb];
 	opp = (void **)&(GC_objfreelist[lg]);

gc-7.1-sparc.patch:

--- NEW FILE gc-7.1-sparc.patch ---
diff -up gc-7.1/configure.sparc gc-7.1/configure
--- gc-7.1/configure.sparc	2008-05-03 19:52:50.000000000 -0500
+++ gc-7.1/configure	2008-10-15 07:01:18.000000000 -0500
@@ -6161,6 +6161,9 @@ _ACEOF
  sparc-*-netbsd*)
     machdep="mach_dep.lo sparc_netbsd_mach_dep.lo"
     ;;
+ sparc*-*-linux*)
+    machdep="mach_dep.lo sparc_mach_dep.lo"
+    ;;
  sparc-sun-solaris2.3)
     machdep="mach_dep.lo sparc_mach_dep.lo"
     cat >>confdefs.h <<\_ACEOF
diff -up gc-7.1/configure.ac.sparc gc-7.1/configure.ac
--- gc-7.1/configure.ac.sparc	2008-05-03 19:52:06.000000000 -0500
+++ gc-7.1/configure.ac	2008-10-15 07:01:18.000000000 -0500
@@ -405,6 +405,9 @@ case "$host" in
  sparc-*-netbsd*)
     machdep="mach_dep.lo sparc_netbsd_mach_dep.lo"
     ;;
+ sparc*-*-linux*)
+    machdep="mach_dep.lo sparc_mach_dep.lo"
+    ;;
  sparc-sun-solaris2.3)
     machdep="mach_dep.lo sparc_mach_dep.lo"
     AC_DEFINE(SUNOS53_SHARED_LIB)
diff -up gc-7.1/mach_dep.c.sparc gc-7.1/mach_dep.c
--- gc-7.1/mach_dep.c.sparc	2007-08-13 16:49:11.000000000 -0500
+++ gc-7.1/mach_dep.c	2008-10-15 07:03:35.000000000 -0500
@@ -175,9 +175,10 @@ void GC_with_callee_saves_pushed(void (*
 #   if defined(HAVE_PUSH_REGS)
       GC_push_regs();
 #   elif defined(UNIX_LIKE) && !defined(DARWIN) && !defined(ARM32) && \
-	 !defined(HURD)
+	 !defined(HURD) && !defined(SPARC)
       /* Older versions of Darwin seem to lack getcontext(). */
       /* ARM Linux often doesn't support a real getcontext(). */
+      /* SPARC 32bit Linux doesn't support getcontext(). */
       ucontext_t ctxt;
       if (getcontext(&ctxt) < 0)
 	ABORT ("Getcontext failed: Use another register retrieval method?");


Index: gc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gc.spec	3 Oct 2008 17:13:38 -0000	1.35
+++ gc.spec	15 Oct 2008 13:09:00 -0000	1.36
@@ -3,7 +3,7 @@
 Name:    gc	
 Version: 7.1
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -11,7 +11,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # To be more backward-compatible abi-wise, TODO: upstream ml reference
-Patch1: gc-7.0-gcinit.patch
+Patch1: gc-7.1-gcinit.patch
+Patch3: gc-7.1-sparc.patch
 ## upstream patches
 # http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2008-May/002206.html
 Patch100: gc-7.1-dont_add_byte.patch
@@ -45,6 +46,7 @@
 %if 0%{?rhel} < 6 && 0%{?fedora} < 10
 %patch1 -p1 -b .gcinit
 %endif
+%patch3 -p1 -b .sparc
 
 %patch100 -p1 -b .dont_add_byte
 
@@ -112,6 +114,9 @@
 
 
 %changelog
+* Wed Oct 15 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-5
+- forward-port patches (gcinit, sparc)
+
 * Fri Oct 03 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-4
 - BR: libatomic_ops-devel
 


--- gc-7.0-gcinit.patch DELETED ---