From: Mike Frysinger Date: Tue, 3 Jan 2012 16:32:28 +0000 (+0000) Subject: Use ENTRY/END macros in old-ABI ARM sysdep-cancel.h. X-Git-Tag: glibc-2.16-ports-before-merge~325 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8117345d2231ba93f5684c63f2b512e4d7fca9d2;p=thirdparty%2Fglibc.git Use ENTRY/END macros in old-ABI ARM sysdep-cancel.h. --- diff --git a/ChangeLog.arm b/ChangeLog.arm index 9108624c12a..de9a2c1ff01 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,8 @@ +2012-01-03 Mike Frysinger + + * 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 * 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 9c80771875c..506558d3f70 100644 --- 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; \