Use ENTRY/END macros in old-ABI ARM sysdep-cancel.h.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 9108624..de9a2c1 100644 (file)
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2012-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+       * sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (PSEUDO): Change
+       .type/.globl/label to ENTRY().  Change .size to END().
+
 2011-12-20  Peter Green  <plugwash@p10link.net>
 
        * sysdeps/unix/sysv/linux/arm/sys/ucontext.h: Don't include

diff --git a/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
index 9c80771..506558d 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2012
+   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
@@ -28,12 +29,10 @@
 # define PSEUDO(name, syscall_name, args)                              \
   .section ".text";                                                    \
     PSEUDO_PROLOGUE;                                                   \
-  .type __##syscall_name##_nocancel,%function;                         \
-  .globl __##syscall_name##_nocancel;                                  \
-  __##syscall_name##_nocancel:                                         \
+  ENTRY (__##syscall_name##_nocancel);                                 \
     DO_CALL (syscall_name, args);                                      \
     PSEUDO_RET;                                                                \
-  .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel;     \
+  END (__##syscall_name##_nocancel);                                   \
   ENTRY (name);                                                                \
     SINGLE_THREAD_P;                                                   \
     DOARGS_##args;                                                     \