From: Roland McGrath <roland@gnu.org>
Date: Fri, 21 Mar 2003 20:52:12 +0000 (+0000)
Subject: * sysdeps/arm/sysdep.h (CALL_MCOUNT): Add trailing semicolon.
X-Git-Tag: cvs/glibc-2_3_3~1114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88b3f3ede294499cef1cb36cc6a5f4662d205e9d;p=thirdparty%2Fglibc.git

* sysdeps/arm/sysdep.h (CALL_MCOUNT): Add trailing semicolon.
---

diff --git a/ChangeLog b/ChangeLog
index aadb5079d46..bd574a21f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-21  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/arm/sysdep.h (CALL_MCOUNT): Add trailing semicolon.
+
 2003-03-21  Alexandre Oliva  <aoliva@redhat.com>
 
 	* sysdeps/mips/mips64/memcpy.S, sysdeps/mips/mips64/memset.S: New.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9c36525f9ad..d656ef8bc09 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-21  Daniel Jacobowitz  <drow@mvista.com>
+
+	* sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+	(SINGLE_THREAD_P_PIC): Use "reg" instead of "lr".
+
 2003-03-21  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/i386/tls.h [__ASSUME_SET_THREAD_AREA_SYSCALL]
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index 38e472d2ba3..47af28090b1 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -110,7 +110,7 @@ extern int __local_multiple_threads attribute_hidden;
   ldr reg, 2b;								\
 3:									\
   add ip, pc, ip;							\
-  ldr ip, [ip, lr];							\
+  ldr ip, [ip, reg];							\
   teq ip, #0;
 #   define SINGLE_THREAD_P_INT						\
   str lr, [sp, $-4]!;							\
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 8d5ab953485..4bc7d827b86 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for ARM.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -76,7 +76,7 @@
 #define CALL_MCOUNT			\
 	str	lr,[sp, #-4]!	;	\
 	bl	PLTJMP(mcount)	;	\
-	ldr	lr, [sp], #4
+	ldr	lr, [sp], #4	;
 #else
 #define CALL_MCOUNT		/* Do nothing.  */
 #endif