[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r22265 - in /fsf/trunk/libc: ./ posix/ sysdeps/sparc/ sysdeps/sparc/sparc32/ sysdeps/sparc/sparc32/sparcv9/ sysdeps/sparc/sp...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r22265 - in /fsf/trunk/libc: ./ posix/ sysdeps/sparc/ sysdeps/sparc/sparc32/ sysdeps/sparc/sparc32/sparcv9/ sysdeps/sparc/sp...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 22 Jan 2013 00:02:01 -0000
Author: eglibc
Date: Tue Jan 22 00:01:59 2013
New Revision: 22265
Log:
Import glibc-mainline for 2013-01-22
Added:
fsf/trunk/libc/sysdeps/sparc/backtrace.c
fsf/trunk/libc/sysdeps/sparc/sparc32/backtrace.h
fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/backtrace.h
fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.h
Removed:
fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/posix/wordexp.c
fsf/trunk/libc/sysdeps/sparc/Makefile
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Jan 22 00:01:59 2013
@@ -1,3 +1,19 @@
+2013-01-21 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * sysdeps/sparc/backtrace.c: New file.
+ * sysdeps/sparc/sparc32/backtrace.h: New file.
+ * sysdeps/sparc/sparc32/sparcv9/backtrace.h: New file.
+ * sysdeps/sparc/sparc64/backtrace.h: New file.
+ * sysdeps/sparc/sparc64/backtrace.c: Delete.
+ * sysdeps/sparc/Makefile (CFLAGS-backtrace.c): Add
+ -funwind-tables.
+
+2013-01-21 Andreas Schwab <schwab@xxxxxxx>
+
+ [BZ #15020]
+ * posix/wordexp.c (exec_comm): Avoid busy loop when command has
+ closed its stdout.
+
2013-01-20 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
* sysdeps/powerpc/powerpc32/power4/fpu/mpa.c: Don't include
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Jan 22 00:01:59 2013
@@ -10,7 +10,7 @@
* The following bugs are resolved with this release:
13951, 14200, 14317, 14327, 14496, 14964, 14981, 14982, 14985, 14994,
- 14996, 15003, 15023.
+ 14996, 15003, 15020, 15023.
Version 2.17
Modified: fsf/trunk/libc/posix/wordexp.c
==============================================================================
--- fsf/trunk/libc/posix/wordexp.c (original)
+++ fsf/trunk/libc/posix/wordexp.c Tue Jan 22 00:01:59 2013
@@ -953,7 +953,12 @@
if ((buflen = TEMP_FAILURE_RETRY (__read (fildes[0], buffer,
bufsize))) < 1)
{
- if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, WNOHANG)) == 0)
+ /* If read returned 0 then the process has closed its
+ stdout. Don't use WNOHANG in that case to avoid busy
+ looping until the process eventually exits. */
+ if (TEMP_FAILURE_RETRY (__waitpid (pid, &status,
+ buflen == 0 ? 0 : WNOHANG))
+ == 0)
continue;
if ((buflen = TEMP_FAILURE_RETRY (__read (fildes[0], buffer,
bufsize))) < 1)
@@ -983,7 +988,12 @@
if ((buflen = TEMP_FAILURE_RETRY (__read (fildes[0], buffer,
bufsize))) < 1)
{
- if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, WNOHANG)) == 0)
+ /* If read returned 0 then the process has closed its
+ stdout. Don't use WNOHANG in that case to avoid busy
+ looping until the process eventually exits. */
+ if (TEMP_FAILURE_RETRY (__waitpid (pid, &status,
+ buflen == 0 ? 0 : WNOHANG))
+ == 0)
continue;
if ((buflen = TEMP_FAILURE_RETRY (__read (fildes[0], buffer,
bufsize))) < 1)
Modified: fsf/trunk/libc/sysdeps/sparc/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/Makefile (original)
+++ fsf/trunk/libc/sysdeps/sparc/Makefile Tue Jan 22 00:01:59 2013
@@ -2,6 +2,10 @@
long-double-fcts = yes
pie-ccflag = -fPIE
+
+ifeq ($(subdir),debug)
+CFLAGS-backtrace.c += -funwind-tables
+endif
ifeq ($(subdir),gmon)
sysdep_routines += sparc-mcount
Added: fsf/trunk/libc/sysdeps/sparc/backtrace.c
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/backtrace.c (added)
+++ fsf/trunk/libc/sysdeps/sparc/backtrace.c Tue Jan 22 00:01:59 2013
@@ -1,0 +1,163 @@
+/* Return backtrace of current program state.
+ Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by David S. Miller <davem@xxxxxxxxxxxxx>
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#include <execinfo.h>
+#include <stddef.h>
+#include <bp-checks.h>
+#include <sysdep.h>
+#include <sys/trap.h>
+#include <dlfcn.h>
+#include <unwind.h>
+#include <backtrace.h>
+
+struct layout
+{
+ unsigned long locals[8];
+ unsigned long ins[6];
+ unsigned long next;
+ void *__unbounded return_address;
+};
+
+struct trace_arg
+{
+ void **array;
+ _Unwind_Word cfa;
+ int cnt;
+ int size;
+};
+
+#ifdef SHARED
+static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
+static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
+static _Unwind_Word (*unwind_getcfa) (struct _Unwind_Context *);
+static void *libgcc_handle;
+
+/* Dummy version in case libgcc_s does not contain the real code. */
+static _Unwind_Word
+dummy_getcfa (struct _Unwind_Context *ctx __attribute__ ((unused)))
+{
+ return 0;
+}
+
+static void
+init (void)
+{
+ libgcc_handle = __libc_dlopen ("libgcc_s.so.1");
+
+ if (libgcc_handle == NULL)
+ return;
+
+ unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace");
+ unwind_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP");
+ if (unwind_getip == NULL)
+ unwind_backtrace = NULL;
+ unwind_getcfa = (__libc_dlsym (libgcc_handle, "_Unwind_GetCFA")
+ ?: dummy_getcfa);
+}
+#else
+# define unwind_backtrace _Unwind_Backtrace
+# define unwind_getip _Unwind_GetIP
+# define unwind_getcfa _Unwind_GetCFA
+#endif
+
+static _Unwind_Reason_Code
+backtrace_helper (struct _Unwind_Context *ctx, void *a)
+{
+ struct trace_arg *arg = a;
+ _Unwind_Ptr ip;
+
+ /* We are first called with address in the __backtrace function.
+ Skip it. */
+ if (arg->cnt != -1)
+ {
+ ip = unwind_getip (ctx);
+ arg->array[arg->cnt] = (void *) ip;
+
+ /* Check whether we make any progress. */
+ _Unwind_Word cfa = unwind_getcfa (ctx);
+
+ if (arg->cnt > 0 && arg->array[arg->cnt - 1] == arg->array[arg->cnt]
+ && cfa == arg->cfa)
+ return _URC_END_OF_STACK;
+ arg->cfa = cfa;
+ }
+ if (++arg->cnt == arg->size)
+ return _URC_END_OF_STACK;
+ return _URC_NO_REASON;
+}
+
+int
+__backtrace (void **array, int size)
+{
+ struct trace_arg arg = { .array = array, .cfa = 0, .size = size, .cnt = -1 };
+ bool use_unwinder;
+ int count;
+
+ if (!size)
+ return 0;
+
+ use_unwinder = true;
+#ifdef SHARED
+ __libc_once_define (static, once);
+
+ __libc_once (once, init);
+ if (unwind_backtrace == NULL)
+ use_unwinder = false;
+#endif
+
+ if (use_unwinder == false)
+ {
+ struct layout *current;
+ unsigned long fp, i7;
+
+ asm volatile ("mov %%fp, %0" : "=r"(fp));
+ asm volatile ("mov %%i7, %0" : "=r"(i7));
+ current = (struct layout *__unbounded) (fp + BACKTRACE_STACK_BIAS);
+ current = BOUNDED_1 (current);
+
+ array[0] = (void *__unbounded) i7;
+
+ if (size == 1)
+ return 1;
+
+ backtrace_flush_register_windows();
+ for (count = 1; count < size; count++)
+ {
+ array[count] = current->return_address;
+ if (!current->next)
+ break;
+ current = (struct layout *__unbounded) (current->next
+ + BACKTRACE_STACK_BIAS);
+ current = BOUNDED_1 (current);
+ }
+ }
+ else
+ {
+ unwind_backtrace (backtrace_helper, &arg);
+
+ /* _Unwind_Backtrace seems to put NULL address above
+ _start. Fix it up here. */
+ if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL)
+ --arg.cnt;
+ count = arg.cnt != -1 ? arg.cnt : 0;
+ }
+ return count;
+}
+weak_alias (__backtrace, backtrace)
+libc_hidden_def (__backtrace)
Added: fsf/trunk/libc/sysdeps/sparc/sparc32/backtrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc32/backtrace.h (added)
+++ fsf/trunk/libc/sysdeps/sparc/sparc32/backtrace.h Tue Jan 22 00:01:59 2013
@@ -1,0 +1,7 @@
+/* Private macros for guiding the backtrace implementation, sparc32
+ version. */
+
+#define backtrace_flush_register_windows() \
+ asm volatile ("ta %0" : : "i" (ST_FLUSH_WINDOWS))
+
+#define BACKTRACE_STACK_BIAS 0
Added: fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/backtrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/backtrace.h (added)
+++ fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/backtrace.h Tue Jan 22 00:01:59 2013
@@ -1,0 +1,7 @@
+/* Private macros for guiding the backtrace implementation, sparc32 v9
+ version. */
+
+#define backtrace_flush_register_windows() \
+ asm volatile ("flushw")
+
+#define BACKTRACE_STACK_BIAS 0
Removed: fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.c
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.c (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.c (removed)
@@ -1,57 +1,0 @@
-/* Return backtrace of current program state.
- Copyright (C) 2008-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by David S. Miller <davem@xxxxxxxxxxxxx>
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <http://www.gnu.org/licenses/>. */
-
-#include <execinfo.h>
-#include <stddef.h>
-#include <bp-checks.h>
-#include <sysdep.h>
-
-struct layout
-{
- unsigned long locals[8];
- unsigned long ins[6];
- unsigned long next;
- void *__unbounded return_address;
-};
-
-int
-__backtrace (void **array, int size)
-{
- struct layout *current;
- unsigned long fp;
- int count;
-
- asm volatile ("flushw");
- asm volatile ("mov %%fp, %0" : "=r"(fp));
- current = (struct layout *__unbounded) (fp + STACK_BIAS);
- current = BOUNDED_1 (current);
-
- for (count = 0; count < size; count++)
- {
- array[count] = current->return_address;
- if (!current->next)
- break;
- current = (struct layout *__unbounded) (current->next + STACK_BIAS);
- current = BOUNDED_1 (current);
- }
-
- return count;
-}
-weak_alias (__backtrace, backtrace)
-libc_hidden_def (__backtrace)
Added: fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.h (added)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/backtrace.h Tue Jan 22 00:01:59 2013
@@ -1,0 +1,7 @@
+/* Private macros for guiding the backtrace implementation, sparc64
+ version. */
+
+#define backtrace_flush_register_windows() \
+ asm volatile ("flushw")
+
+#define BACKTRACE_STACK_BIAS STACK_BIAS
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits