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

diff --git a/ChangeLog b/ChangeLog
index aadb507..bd574a2 100644 (file)
--- 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 9c36525..d656ef8 100644 (file)
--- 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 38e472d..47af280 100644 (file)
--- 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 8d5ab95..4bc7d82 100644 (file)
--- 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