diff options
| author | DJ Delorie <dj@delorie.com> | 2013-10-23 22:37:21 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2013-10-23 22:37:21 +0000 |
| commit | d003ade0b11c1571abedce4238f50b7b23d42308 (patch) | |
| tree | 1392ebf957beaaff958bb9ab4e717def67bf6eb7 | |
| parent | 2cec45808a2a3f4ba7fcad1a4b01f64b0e83a194 (diff) | |
| download | gdb-d003ade0b11c1571abedce4238f50b7b23d42308.tar.gz | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/gdb/gdb-index.h | 4 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 10 | ||||
| -rw-r--r-- | libiberty/testsuite/test-expandargv.c | 3 |
4 files changed, 16 insertions, 5 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 972572fdac2..68dc5bbdfe9 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2013-10-22 Sterling Augustine <saugustine@google.com> + + * gdb/gdb-index.h: Merge from gdb tree. + 2013-10-10 Sean Keys <skeys@ipdatasys.com> * xgate.h : Cleanup after opcode diff --git a/include/gdb/gdb-index.h b/include/gdb/gdb-index.h index c197c9d3790..b43c68f9e3b 100644 --- a/include/gdb/gdb-index.h +++ b/include/gdb/gdb-index.h @@ -1,5 +1,5 @@ /* Public attributes of the .gdb_index section. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012 Free Software Foundation, Inc. This file is part of GDB. @@ -68,7 +68,7 @@ typedef enum { Give the unused bits a value so gdb will print them sensibly. */ GDB_INDEX_SYMBOL_KIND_UNUSED5 = 5, GDB_INDEX_SYMBOL_KIND_UNUSED6 = 6, - GDB_INDEX_SYMBOL_KIND_UNUSED7 = 7, + GDB_INDEX_SYMBOL_KIND_UNUSED7 = 7 } gdb_index_symbol_kind; #define GDB_INDEX_SYMBOL_KIND_SHIFT 28 diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7250dc1f490..3a214efb14c 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2013-10-23 Gerald Pfeifer <gerald@pfeifer.com> + + * testsuite/test-expandargv.c: Include unistd.h. + 2013-10-15 David Malcolm <dmalcolm@redhat.com> * configure.ac: If --enable-host-shared, use -fPIC. @@ -83,7 +87,7 @@ * hashtab.c (hash_pointer): Remove conditional and avoid unexecuted shift equal to wordsize. -2013-04-22 Andi Kleen <ak@linux.intel.com> +2013-04-22 Andi Kleen <ak@linux.intel.com> * hashtab.c (hash_pointer): Move to end of file and reimplement. @@ -657,12 +661,12 @@ * aclocal.m4 (AC_LANG_FUNC_LINK_TRY(C)): Delete. * configure: Regenerate. -2010-10-07 Andi Kleen <ak@linux.intel.com> +2010-10-07 Andi Kleen <ak@linux.intel.com> * configure: Regenerate. * configure.ac: Turn PR_SET_NAME check into link check. -2010-10-06 Andi Kleen <ak@linux.intel.com> +2010-10-06 Andi Kleen <ak@linux.intel.com> * Makefile.in (CFILES): Add setproctitle. (CONFIGURED_OFILES): Add setproctitle. diff --git a/libiberty/testsuite/test-expandargv.c b/libiberty/testsuite/test-expandargv.c index dff20d41daf..0edd751722b 100644 --- a/libiberty/testsuite/test-expandargv.c +++ b/libiberty/testsuite/test-expandargv.c @@ -40,6 +40,9 @@ #ifdef HAVE_STRING_H #include <string.h> #endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #ifndef EXIT_SUCCESS #define EXIT_SUCCESS 0 |