Merge changes between r22176 and r22241 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@22242 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 5 insertions, 6 deletions

diff --git a/libc/debug/tst-backtrace4.c b/libc/debug/tst-backtrace4.c
index cce4319ff..41a3f5134 100644
--- a/libc/debug/tst-backtrace4.c
+++ b/libc/debug/tst-backtrace4.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Test backtrace and backtrace_symbols for signal frames.
+   Copyright (C) 2011-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by CodeSourcery.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <execinfo.h>
 #include <search.h>
@@ -46,7 +45,7 @@ volatile int x;
 
 /* Use this attribute to prevent inlining, so that all expected frames
    are present.  */
-#define NO_INLINE __attribute__((noinline))
+#define NO_INLINE __attribute__ ((noinline))
 
 volatile int sig_handled = 0;