From 6fc1ece8240f262043817c8e50841e78b8ec057f Mon Sep 17 00:00:00 2001 From: joseph Date: Tue, 3 Jan 2012 21:57:20 +0000 Subject: Merge changes between r16431 and r16494 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@16495 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/ChangeLog | 23 ++++++++++++++++++++++ libc/catgets/gencat.c | 4 ++-- libc/csu/version.c | 4 ++-- libc/debug/catchsegv.sh | 4 ++-- libc/debug/xtrace.sh | 4 ++-- libc/elf/ldconfig.c | 4 ++-- libc/elf/ldd.bash.in | 4 ++-- libc/elf/pldd.c | 4 ++-- libc/elf/sotruss.ksh | 4 ++-- libc/elf/sprof.c | 4 ++-- libc/iconv/iconv_prog.c | 4 ++-- libc/iconv/iconvconfig.c | 4 ++-- libc/locale/programs/locale.c | 4 ++-- libc/locale/programs/localedef.c | 4 ++-- libc/login/programs/pt_chown.c | 4 ++-- libc/malloc/memusage.sh | 4 ++-- libc/malloc/mtrace.pl | 4 ++-- libc/nscd/nscd.c | 4 ++-- libc/nss/getent.c | 4 ++-- libc/nss/makedb.c | 4 ++-- libc/posix/getconf.c | 4 ++-- ports/ChangeLog.arm | 12 +++++++++++ ports/ChangeLog.mips | 5 +++++ ports/sysdeps/mips/Makefile | 4 ++++ ports/sysdeps/mips/backtrace.c | 1 + .../unix/sysv/linux/arm/nptl/sysdep-cancel.h | 9 ++++----- ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S | 4 +++- 27 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 ports/sysdeps/mips/backtrace.c diff --git a/libc/ChangeLog b/libc/ChangeLog index 7a534b473..737c4ba19 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,26 @@ +2012-01-01 Ulrich Drepper + + * posix/getconf.c: Update copyright year. + * nss/getent.c: Likewise. + * nss/makedb.c: Likewise. + * iconv/iconvconfig.c: Likewise. + * iconv/iconv_prog.c: Likewise. + * elf/ldconfig.c: Likewise. + * elf/pldd.c: Likewise. + * elf/sotruss.ksh: Likewise. + * catgets/gencat.c: Likewise. + * csu/version.c: Likewise. + * elf/ldd.bash.in: Likewise. + * elf/sprof.c (print_version): Likewise. + * locale/programs/locale.c: Likewise. + * locale/programs/localedef.c: Likewise. + * login/programs/pt_chown.c: Likewise. + * nscd/nscd.c (print_version): Likewise. + * debug/xtrace.sh: Likewise. + * malloc/memusage.sh: Likewise. + * malloc/mtrace.pl: Likewise. + * debug/catchsegv.sh: Likewise. + 2011-12-30 Jakub Jelinek * posix/regex_internal.c (re_string_fetch_byte_case): Remove diff --git a/libc/catgets/gencat.c b/libc/catgets/gencat.c index 182064194..a3a1a9042 100644 --- a/libc/catgets/gencat.c +++ b/libc/catgets/gencat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1996-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -250,7 +250,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/csu/version.c b/libc/csu/version.c index 633bf92ac..455283e1e 100644 --- a/libc/csu/version.c +++ b/libc/csu/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1992-2011, 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 @@ -26,7 +26,7 @@ static const char __libc_version[] = VERSION; static const char banner[] = "GNU C Library "PKGVERSION RELEASE" release version "VERSION", by Roland McGrath et al.\n\ -Copyright (C) 2011 Free Software Foundation, Inc.\n\ +Copyright (C) 2012 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n\ diff --git a/libc/debug/catchsegv.sh b/libc/debug/catchsegv.sh index 58427a3ae..9f64c6fd3 100755 --- a/libc/debug/catchsegv.sh +++ b/libc/debug/catchsegv.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998,1999,2001,2003,2004,2006,2007,2008,2009,2010,2011 +# Copyright (C) 1998,1999,2001,2003,2004,2006,2007,2008,2009,2010,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1998. @@ -40,7 +40,7 @@ if test $# -eq 0; then ;; --v | --ve | --ver | --vers | --versi | --versio | --version) echo 'catchsegv @PKGVERSION@@VERSION@' - echo 'Copyright (C) 2011 Free Software Foundation, Inc. + echo 'Copyright (C) 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Written by Ulrich Drepper.' diff --git a/libc/debug/xtrace.sh b/libc/debug/xtrace.sh index ba4051bd0..b19879805 100755 --- a/libc/debug/xtrace.sh +++ b/libc/debug/xtrace.sh @@ -1,5 +1,5 @@ #! @BASH@ -# Copyright (C) 1999, 2001-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001-2011, 2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1999. @@ -66,7 +66,7 @@ do_version() { printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2011" +" "2012" printf $"Written by %s. " "Ulrich Drepper" exit 0 diff --git a/libc/elf/ldconfig.c b/libc/elf/ldconfig.c index 8f4867b6b..bc027d5eb 100644 --- a/libc/elf/ldconfig.c +++ b/libc/elf/ldconfig.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger , 1999. @@ -320,7 +320,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Andreas Jaeger"); } diff --git a/libc/elf/ldd.bash.in b/libc/elf/ldd.bash.in index 282504664..373598235 100644 --- a/libc/elf/ldd.bash.in +++ b/libc/elf/ldd.bash.in @@ -1,5 +1,5 @@ #! @BASH@ -# Copyright (C) 1996-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2011, 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 @@ -39,7 +39,7 @@ while test $# -gt 0; do printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2011" +" "2012" printf $"Written by %s and %s. " "Roland McGrath" "Ulrich Drepper" exit 0 diff --git a/libc/elf/pldd.c b/libc/elf/pldd.c index 2bb7a2d1e..61987e69c 100644 --- a/libc/elf/pldd.c +++ b/libc/elf/pldd.c @@ -1,5 +1,5 @@ /* List dynamic shared objects linked into given process. - Copyright (C) 2011 Free Software Foundation, Inc. + Copyright (C) 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2011. @@ -220,7 +220,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/elf/sotruss.ksh b/libc/elf/sotruss.ksh index 1c3f4eebf..4cad8d881 100755 --- a/libc/elf/sotruss.ksh +++ b/libc/elf/sotruss.ksh @@ -1,5 +1,5 @@ #! @KSH@ -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011, 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 @@ -77,7 +77,7 @@ while test $# -gt 0; do printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2011" +" "2012" printf $"Written by %s.\n" "Ulrich Drepper" exit 0 ;; diff --git a/libc/elf/sprof.c b/libc/elf/sprof.c index 2d1d2ac28..cb0e1900a 100644 --- a/libc/elf/sprof.c +++ b/libc/elf/sprof.c @@ -1,5 +1,5 @@ /* Read and display shared object profiling data. - Copyright (C) 1997-2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -391,7 +391,7 @@ Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ "), - "2011"); + "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/iconv/iconv_prog.c b/libc/iconv/iconv_prog.c index 632555965..9227da355 100644 --- a/libc/iconv/iconv_prog.c +++ b/libc/iconv/iconv_prog.c @@ -1,5 +1,5 @@ /* Convert text in given files from the specified from-set to the to-set. - Copyright (C) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -435,7 +435,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/iconv/iconvconfig.c b/libc/iconv/iconvconfig.c index 2c20e80e9..9b94a58cf 100644 --- a/libc/iconv/iconvconfig.c +++ b/libc/iconv/iconvconfig.c @@ -1,5 +1,5 @@ /* Generate fastloading iconv module configuration files. - Copyright (C) 2000-2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2000-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2000. @@ -399,7 +399,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/locale/programs/locale.c b/libc/locale/programs/locale.c index b1c0954e6..d23ba7307 100644 --- a/libc/locale/programs/locale.c +++ b/libc/locale/programs/locale.c @@ -1,5 +1,5 @@ /* Implementation of the locale program according to POSIX 9945-2. - Copyright (C) 1995-1997, 1999-2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1995. @@ -297,7 +297,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/locale/programs/localedef.c b/libc/locale/programs/localedef.c index 0f5f9cc39..6c0eae28e 100644 --- a/libc/locale/programs/localedef.c +++ b/libc/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1995. @@ -407,7 +407,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/login/programs/pt_chown.c b/libc/login/programs/pt_chown.c index 75d68ea96..d406d9a3e 100644 --- a/libc/login/programs/pt_chown.c +++ b/libc/login/programs/pt_chown.c @@ -1,5 +1,5 @@ /* pt_chmod - helper program for `grantpt'. - Copyright (C) 1998, 1999, 2009 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by C. Scott Ananian , 1998. @@ -64,7 +64,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); } static char * diff --git a/libc/malloc/memusage.sh b/libc/malloc/memusage.sh index 48d695aab..7a389a1b0 100755 --- a/libc/malloc/memusage.sh +++ b/libc/malloc/memusage.sh @@ -1,5 +1,5 @@ #! @BASH@ -# Copyright (C) 1999-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1999. @@ -73,7 +73,7 @@ do_version() { printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2011" +" "2012" printf $"Written by %s. " "Ulrich Drepper" exit 0 diff --git a/libc/malloc/mtrace.pl b/libc/malloc/mtrace.pl index 0372f53bf..2a21e7ac0 100644 --- a/libc/malloc/mtrace.pl +++ b/libc/malloc/mtrace.pl @@ -1,7 +1,7 @@ #! @PERL@ eval "exec @PERL@ -S $0 $@" if 0; -# Copyright (C) 1997-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1997-2011, 2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1997. # Based on the mtrace.awk script. @@ -46,7 +46,7 @@ arglist: while (@ARGV) { $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" || $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") { print "mtrace $PKGVERSION$VERSION\n"; - print "Copyright (C) 2011 Free Software Foundation, Inc.\n"; + print "Copyright (C) 2012 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; print "Written by Ulrich Drepper \n"; diff --git a/libc/nscd/nscd.c b/libc/nscd/nscd.c index f0521fe0e..26a990f5d 100644 --- a/libc/nscd/nscd.c +++ b/libc/nscd/nscd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (c) 1998-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1998. @@ -449,7 +449,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk and Ulrich Drepper"); } diff --git a/libc/nss/getent.c b/libc/nss/getent.c index c3649fcb0..7b44d5dc6 100644 --- a/libc/nss/getent.c +++ b/libc/nss/getent.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (c) 1998-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1998. @@ -89,7 +89,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk"); } diff --git a/libc/nss/makedb.c b/libc/nss/makedb.c index e7bd8f858..54cf959e6 100644 --- a/libc/nss/makedb.c +++ b/libc/nss/makedb.c @@ -1,5 +1,5 @@ /* Create simple DB database from textual input. - Copyright (C) 1996-2000, 2011 Free Software Foundation, Inc. + Copyright (C) 1996-2000, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -380,7 +380,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/posix/getconf.c b/libc/posix/getconf.c index 6206dd1c7..d6edadfb8 100644 --- a/libc/posix/getconf.c +++ b/libc/posix/getconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995-2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -1105,7 +1105,7 @@ main (int argc, char *argv[]) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); printf (gettext ("Written by %s.\n"), "Roland McGrath"); return 0; } diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 9108624c1..36027d56a 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,15 @@ +2012-01-03 Mike Frysinger + + [BZ #12354] + * sysdeps/unix/sysv/linux/arm/sigrestorer.S (__default_sa_restorer): + Add END(__default_sa_restorer). + (__default_rt_sa_restorer): Add END(__default_rt_sa_restorer). + +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/ports/ChangeLog.mips b/ports/ChangeLog.mips index 8e60fb276..4bb1a4db5 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,8 @@ +2012-01-03 Tom de Vries + + * sysdeps/mips/backtrace.c: New file, including ia64 backtrace.c. + * sysdeps/mips/Makefile: Compile backtrace.c with -funwind-tables. + 2011-12-22 Joseph Myers * sysdeps/unix/sysv/linux/mips/Makefile (no_syscall_list_h) diff --git a/ports/sysdeps/mips/Makefile b/ports/sysdeps/mips/Makefile index 9d01522a3..b7e5e6192 100644 --- a/ports/sysdeps/mips/Makefile +++ b/ports/sysdeps/mips/Makefile @@ -11,4 +11,8 @@ ifeq ($(subdir),rt) librt-sysdep_routines += rt-sysdep endif +ifeq ($(subdir),debug) +CFLAGS-backtrace.c += -funwind-tables +endif + ASFLAGS-.os += $(pic-ccflag) diff --git a/ports/sysdeps/mips/backtrace.c b/ports/sysdeps/mips/backtrace.c new file mode 100644 index 000000000..297029456 --- /dev/null +++ b/ports/sysdeps/mips/backtrace.c @@ -0,0 +1 @@ +#include diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h index 9c8077187..506558d3f 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h +++ b/ports/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; \ diff --git a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S index 98e33cb8b..d9cc40fb0 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S +++ b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 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 @@ -24,10 +24,12 @@ ENTRY(__default_sa_restorer) swi SYS_ify(sigreturn) +END(__default_sa_restorer) #ifdef __NR_rt_sigreturn ENTRY(__default_rt_sa_restorer) swi SYS_ify(rt_sigreturn) +END(__default_rt_sa_restorer) #endif -- cgit v1.2.1