Author: dan
Date: 2005-10-14 17:40:36 +0000 (Fri, 14 Oct 2005)
New Revision: 1046

Added:
   glibc-package/trunk/debian/patches/hppa-iitlbp.dpatch
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/00list
Log:
  * Update hppa assembly for current CVS binutils.


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2005-10-14 13:46:00 UTC (rev 
1045)
+++ glibc-package/trunk/debian/changelog        2005-10-14 17:40:36 UTC (rev 
1046)
@@ -23,8 +23,9 @@
   * Merge MIPS <bits/syscall.h> fix from CVS (Closes: #329043).
   * Do not complain about incompatible libraries in /etc/ld.so.conf
     (Closes: #310047).
+  * Update hppa assembly for current CVS binutils.
 
- -- Daniel Jacobowitz <[EMAIL PROTECTED]>  Fri, 14 Oct 2005 09:44:11 -0400
+ -- Daniel Jacobowitz <[EMAIL PROTECTED]>  Fri, 14 Oct 2005 13:40:12 -0400
 
 glibc (2.3.5-6) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/patches/00list
===================================================================
--- glibc-package/trunk/debian/patches/00list   2005-10-14 13:46:00 UTC (rev 
1045)
+++ glibc-package/trunk/debian/patches/00list   2005-10-14 17:40:36 UTC (rev 
1046)
@@ -86,3 +86,4 @@
 glibc235-alpha-divqu
 i386-amd64-biarch
 mips-bits-syscall
+hppa-iitlbp

Added: glibc-package/trunk/debian/patches/hppa-iitlbp.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/hppa-iitlbp.dpatch       2005-10-14 
13:46:00 UTC (rev 1045)
+++ glibc-package/trunk/debian/patches/hppa-iitlbp.dpatch       2005-10-14 
17:40:36 UTC (rev 1046)
@@ -0,0 +1,86 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Update iitlbp instructions to satisfy stricter binutils.
+# DP: Dpatch author: Daniel Jacobowitz <[EMAIL PROTECTED]>
+# DP: Patch author: Daniel Jacobowitz <[EMAIL PROTECTED]>
+# DP: Upstream status: Not submitted
+# DP: Date: 2005-10-14
+
+PATCHLEVEL=-p1
+
+if [ $# -ne 2 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
+    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
+    *)
+       echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+       exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+Index: libc/sysdeps/hppa/abort-instr.h
+===================================================================
+RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/abort-instr.h,v
+retrieving revision 1.1
+diff -u -p -r1.1 abort-instr.h
+--- libc/sysdeps/hppa/abort-instr.h    23 Sep 2002 03:30:34 -0000      1.1
++++ libc/sysdeps/hppa/abort-instr.h    14 Oct 2005 14:25:52 -0000
+@@ -3,4 +3,4 @@
+    We go with iitlbp because it has a history of being used to crash
+    programs.  */
+ 
+-#define ABORT_INSTRUCTION asm ("iitlbp %r0,(%r0)")
++#define ABORT_INSTRUCTION asm ("iitlbp %r0,(%sr0,%r0)")
+Index: libc/sysdeps/hppa/dl-machine.h
+===================================================================
+RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/dl-machine.h,v
+retrieving revision 1.21
+diff -u -p -r1.21 dl-machine.h
+--- libc/sysdeps/hppa/dl-machine.h     19 Nov 2004 00:01:25 -0000      1.21
++++ libc/sysdeps/hppa/dl-machine.h     14 Oct 2005 14:57:02 -0000
+@@ -367,7 +367,7 @@ asm (                                                      
                \
+ "     ldw,ma  8(%r26),%r19\n"                                         \
+                                                                       \
+       /* Uh oh!  We didn't find one.  Abort. */                       \
+-"     iitlbp  %r0,(%r0)\n"                                            \
++"     iitlbp  %r0,(%sr0,%r0)\n"                                       \
+                                                                       \
+ "2:   ldw     -4(%r26),%r19\n"        /* Found it, load value. */     \
+ "     add     %r19,%r20,%r19\n"       /* And add the load offset. */  \
+Index: libc/sysdeps/hppa/elf/start.S
+===================================================================
+RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/elf/start.S,v
+retrieving revision 1.5
+diff -u -p -r1.5 start.S
+--- libc/sysdeps/hppa/elf/start.S      16 Aug 2004 04:51:00 -0000      1.5
++++ libc/sysdeps/hppa/elf/start.S      14 Oct 2005 14:26:33 -0000
+@@ -83,7 +83,7 @@ _start:
+       bl      __libc_start_main,%r2
+       nop
+       /* die horribly if it returned (it shouldn't) */
+-      iitlbp %r0,(%r0)
++      iitlbp %r0,(%sr0,%r0)
+       nop
+ 
+       .procend
+Index: libc/sysdeps/unix/sysv/linux/hppa/clone.S
+===================================================================
+RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/unix/sysv/linux/hppa/clone.S,v
+retrieving revision 1.4
+diff -u -p -r1.4 clone.S
+--- libc/sysdeps/unix/sysv/linux/hppa/clone.S  18 Dec 2003 06:05:03 -0000      
1.4
++++ libc/sysdeps/unix/sysv/linux/hppa/clone.S  14 Oct 2005 14:40:59 -0000
+@@ -92,7 +92,7 @@ thread_start:
+       copy    %ret0,%arg0
+ 
+       /* Die horribly.  */
+-      iitlbp  %r0,(%r0)
++      iitlbp  %r0,(%sr0,%r0)
+ 
+ PSEUDO_END(__clone)
+ 


Property changes on: glibc-package/trunk/debian/patches/hppa-iitlbp.dpatch
___________________________________________________________________
Name: svn:executable
   + *


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to