[Pkg-openmpi-commits] r169 - in /openmpi/trunk/debian: changelog patches/alpha_acinclude patches/alpha_build patches/autogen patches/series

[manuel at users.alioth.debian.org]

Author: manuel
Date: Sun Mar 15 21:33:36 2009
New Revision: 169

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=169
Log:
Fixed build issue on Alpha, finally!

Removed patches "vampirtrace" and "autogen" because we do not need
to re-run autotools to fix Alpha. Also, removed the latest Alpha
patch since it is not necessary to fix the build issues and obsolete
when using the VampirTrace patch. The .diff.gz gets a lot smaller now.

Added:
    openmpi/trunk/debian/patches/alpha_build
Removed:
    openmpi/trunk/debian/patches/alpha_acinclude
    openmpi/trunk/debian/patches/autogen
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/series

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=169&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Sun Mar 15 21:33:36 2009
@@ -1,3 +1,9 @@
+openmpi (1.3-3) UNRELEASED; urgency=low
+
+  * Fixed build issues on Alpha. (Closes: #510845, #517543)
+
+ -- Manuel Prinz <manuel at debian.org>  Sun, 15 Mar 2009 22:26:01 +0100
+
 openmpi (1.3-2) unstable; urgency=low
 
   * Updated debian/watch to point to 1.3 series download location

Added: openmpi/trunk/debian/patches/alpha_build
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/alpha_build?rev=169&op=file
==============================================================================
--- openmpi/trunk/debian/patches/alpha_build (added)
+++ openmpi/trunk/debian/patches/alpha_build Sun Mar 15 21:33:36 2009
@@ -1,0 +1,75 @@
+--- a/ompi/contrib/vt/vt/vtlib/vt_pform_linux.c
++++ b/ompi/contrib/vt/vt/vtlib/vt_pform_linux.c
+@@ -170,6 +170,8 @@
+ # elif defined(__ia64__)
+     /* ... ITC */
+     clock_value = __getReg(_IA64_REG_AR_ITC);
++# elif defined(__alpha__)
++    asm volatile ("rpcc %0" : "=r" (clock_value));
+ # else
+     /* ... TSC */
+     {
+--- a/opal/asm/base/ALPHA.asm
++++ b/opal/asm/base/ALPHA.asm
+@@ -197,3 +197,28 @@
+ 	addl $31,$0,$0
+ 	ret $31,($26),1
+ 	.end opal_atomic_cmpset_rel_64
++	.align 2
++	.align 4
++	.globl opal_sys_timer_get_cycles
++	.ent opal_sys_timer_get_cycles
++$opal_sys_timer_get_cycles..ng:
++opal_sys_timer_get_cycles:
++	.eflag 48
++	.frame $30,0,$26,0
++	.prologue 0
++	.set	macro
++	wmb
++	1:  ldq_l $0, 0($16)     
++	cmpeq $0, $17, $0     
++	beq $0, 2f           
++	mov $18, $0           
++	stq_c $0, 0($16)         
++	beq $0, 1b           
++	jmp 3f               
++2:  mov $31, $0      
++3:                   
++
++	.set	nomacro
++	rpcc $0
++	ret
++	.end opal_sys_timer_get_cycles
+--- a/opal/asm/generated/atomic-alpha-linux.s
++++ b/opal/asm/generated/atomic-alpha-linux.s
+@@ -197,5 +197,30 @@
+ 	addl $31,$0,$0
+ 	ret $31,($26),1
+ 	.end opal_atomic_cmpset_rel_64
++	.align 2
++	.align 4
++	.globl opal_sys_timer_get_cycles
++	.ent opal_sys_timer_get_cycles
++$opal_sys_timer_get_cycles..ng:
++opal_sys_timer_get_cycles:
++	.eflag 48
++	.frame $30,0,$26,0
++	.prologue 0
++	.set	macro
++	wmb
++	1:  ldq_l $0, 0($16)     
++	cmpeq $0, $17, $0     
++	beq $0, 2f           
++	mov $18, $0           
++	stq_c $0, 0($16)         
++	beq $0, 1b           
++	jmp 3f               
++2:  mov $31, $0      
++3:                   
++
++	.set	nomacro
++	rpcc $0
++	ret
++	.end opal_sys_timer_get_cycles
+ 
+ 	.section	.note.GNU-stack,"", at progbits

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=169&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Sun Mar 15 21:33:36 2009
@@ -1,14 +1,16 @@
+# Fixes build issues on Alpha.
+alpha_build
+
 # Backport of SVN changesets 20317 and 20318. Will be in 1.3.1.
-vampirtrace
-alpha_acinclude
+# We do not seem to need it currently, as the changes on Alpha do not need
+# to re-run autotools. So we can drop this, and remove the "autogen" patch.
+#vampirtrace
+
 # Updated patch by Thiemo Seufer. Hopefully this will resolve #489173.
 # If this works, it may be included upstream. (Unfortunately, it does not.
 # We should wait for libtool 2.2 to get into unstable before trying again.)
 #mips-support
-# This huge patch is needed to update all autotools-related files.
-# This is required because libtool 2.2 is needed which is not yet in
-# unstable. (But in experimental.)
-autogen
+
 # This patch fixes the manpage issues. It's a backport from upstream SVN,
 # changeset 20307 and will be in 1.3.1.
 manpages