public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM] archer-jankratochvil-absdir: Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-absdir
@ 2012-12-10 7:09 jkratoch
0 siblings, 0 replies; only message in thread
From: jkratoch @ 2012-12-10 7:09 UTC (permalink / raw)
To: archer-commits
The branch, archer-jankratochvil-absdir has been updated
via 196c3453a81014284160c9bae0e3fd2e0c12f7ff (commit)
via ded7dfe6274b281d92a6ed76cedf29d06c918dec (commit)
via 5b7128a1b18d40f376239e87da084c6a38f793a9 (commit)
via 1a7bd07dde2cb1cecfd18546c83ee113038d8ba2 (commit)
via 94627ec78b502d0a11e15cca47d6173f0e6dff0c (commit)
via 1eb942b49cd19f4bec0cc0737a70c0e65feee60b (commit)
via 4f95094fdf63bfdc8a7179e5c3ef7345f8003432 (commit)
from aaa65a09a8538bb6f8641a7945b3d1bfe2db24b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 196c3453a81014284160c9bae0e3fd2e0c12f7ff
Merge: 1a7bd07 ded7dfe
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Mon Dec 10 08:08:04 2012 +0100
Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-absdir
commit ded7dfe6274b281d92a6ed76cedf29d06c918dec
Author: gdbadmin <gdbadmin@sourceware.org>
Date: Mon Dec 10 00:00:03 2012 +0000
*** empty log message ***
commit 5b7128a1b18d40f376239e87da084c6a38f793a9
Author: Alan Modra <amodra@bigpond.net.au>
Date: Sun Dec 9 23:00:04 2012 +0000
daily update
commit 1a7bd07dde2cb1cecfd18546c83ee113038d8ba2
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Dec 9 20:07:08 2012 +0100
Tom's review.
commit 94627ec78b502d0a11e15cca47d6173f0e6dff0c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Dec 9 18:39:57 2012 +0000
gdb/
* configure.ac (CC_HAS_LONG_LONG): Replace by AC_MSG_ERROR.
* defs.h (LONGEST, ULONGEST): Remove conditionalization for
CC_HAS_LONG_LONG.
* dwarf2-frame.c (DW64_CIE_ID): Likewise.
* dwarf2read.c (extract_cu_value): Remove the function.
(create_cus_from_index_list): Make the return type void, inline the
extract_cu_value caller, include new gdb_static_assert.
(create_cus_from_index): Make the return type void, update the function
comment, update the create_cus_from_index_list caller.
(create_signatured_type_table_from_index): Make the return type void,
inline the extract_cu_value caller, include new gdb_static_assert.
(dwarf2_read_index): Update the create_cus_from_index and
create_signatured_type_table_from_index caller.
* printcmd.c (ui_printf): Remove conditionalizations for
CC_HAS_LONG_LONG.
* config.in: Regenerate.
* configure: Regenerate.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove CC_HAS_LONG_LONG.
commit 1eb942b49cd19f4bec0cc0737a70c0e65feee60b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Dec 9 18:01:39 2012 +0000
Properly check indicies bigger than 4Gb
PR binutils/14933
* archive.c (bsd_write_armap): Properly check indicies bigger
than 4Gb.
commit 4f95094fdf63bfdc8a7179e5c3ef7345f8003432
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Dec 9 17:35:39 2012 +0000
gdb/
* dwarf2read.c (struct dwarf2_cu): New field producer_is_gcc_lt_4_3.
Update the comment for checked_producer.
(check_producer): New forward declaration.
(producer_is_gcc_lt_4_3): New function.
(find_file_and_directory): Simulate *COMP_DIR only for gcc < 4.3.
(check_producer): Initialize also PRODUCER_IS_GCC_LT_4_3.
gdb/testsuite/
* gdb.dwarf2/dw2-compdir-oldgcc.S: New file.
* gdb.dwarf2/dw2-compdir-oldgcc.exp: New file.
-----------------------------------------------------------------------
Summary of changes:
bfd/ChangeLog | 6 ++
bfd/archive.c | 7 +-
bfd/version.h | 2 +-
gdb/ChangeLog | 29 ++++++++++
gdb/config.in | 3 -
gdb/configure | 7 +-
gdb/configure.ac | 6 +-
gdb/defs.h | 12 ----
gdb/doc/ChangeLog | 4 +
gdb/doc/gdbint.texinfo | 5 --
gdb/dwarf2-frame.c | 4 -
gdb/dwarf2read.c | 71 +++++++-----------------
gdb/printcmd.c | 6 +-
gdb/source.c | 4 +-
gdb/testsuite/ChangeLog | 5 ++
gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp | 2 +-
gdb/version.in | 2 +-
17 files changed, 81 insertions(+), 94 deletions(-)
First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b8fb291..9b286cf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-09 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR binutils/14933
+ * archive.c (bsd_write_armap): Properly check indicies bigger
+ than 4Gb.
+
2012-12-07 Alan Modra <amodra@gmail.com>
PR ld/14926
diff --git a/bfd/archive.c b/bfd/archive.c
index 8e8fd2d..2fdc8b9 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -2424,9 +2424,6 @@ bsd_write_armap (bfd *arch,
unsigned int count;
struct ar_hdr hdr;
long uid, gid;
- file_ptr max_first_real = 1;
-
- max_first_real <<= 31;
firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
@@ -2469,6 +2466,7 @@ bsd_write_armap (bfd *arch,
for (count = 0; count < orl_count; count++)
{
+ unsigned int offset;
bfd_byte buf[BSD_SYMDEF_SIZE];
if (map[count].u.abfd != last_elt)
@@ -2488,7 +2486,8 @@ bsd_write_armap (bfd *arch,
/* The archive file format only has 4 bytes to store the offset
of the member. Check to make sure that firstreal has not grown
too big. */
- if (firstreal >= max_first_real)
+ offset = (unsigned int) firstreal;
+ if (firstreal != (file_ptr) offset)
{
bfd_set_error (bfd_error_file_truncated);
return FALSE;
diff --git a/bfd/version.h b/bfd/version.h
index 6609c2c..b500b31 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20121209
+#define BFD_VERSION_DATE 20121210
#define BFD_VERSION @bfd_version@
#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
#define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37f2bfb..67b710a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,32 @@
+2012-12-09 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * configure.ac (CC_HAS_LONG_LONG): Replace by AC_MSG_ERROR.
+ * defs.h (LONGEST, ULONGEST): Remove conditionalization for
+ CC_HAS_LONG_LONG.
+ * dwarf2-frame.c (DW64_CIE_ID): Likewise.
+ * dwarf2read.c (extract_cu_value): Remove the function.
+ (create_cus_from_index_list): Make the return type void, inline the
+ extract_cu_value caller, include new gdb_static_assert.
+ (create_cus_from_index): Make the return type void, update the function
+ comment, update the create_cus_from_index_list caller.
+ (create_signatured_type_table_from_index): Make the return type void,
+ inline the extract_cu_value caller, include new gdb_static_assert.
+ (dwarf2_read_index): Update the create_cus_from_index and
+ create_signatured_type_table_from_index caller.
+ * printcmd.c (ui_printf): Remove conditionalizations for
+ CC_HAS_LONG_LONG.
+ * config.in: Regenerate.
+ * configure: Regenerate.
+
+2012-12-09 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * dwarf2read.c (struct dwarf2_cu): New field producer_is_gcc_lt_4_3.
+ Update the comment for checked_producer.
+ (check_producer): New forward declaration.
+ (producer_is_gcc_lt_4_3): New function.
+ (find_file_and_directory): Simulate *COMP_DIR only for gcc < 4.3.
+ (check_producer): Initialize also PRODUCER_IS_GCC_LT_4_3.
+
2012-12-07 Tom Tromey <tromey@redhat.com>
* ada-lang.c (ada_make_symbol_completion_list): Add 'code'
diff --git a/gdb/config.in b/gdb/config.in
index b54d245..9e21325 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -12,9 +12,6 @@
/* Directory of programs. */
#undef BINDIR
-/* Define to 1 if the compiler supports long long. */
-#undef CC_HAS_LONG_LONG
-
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
diff --git a/gdb/configure b/gdb/configure
index e34229b..fdfd17c 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -11602,10 +11602,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_c_long_long" >&5
$as_echo "$gdb_cv_c_long_long" >&6; }
-if test $gdb_cv_c_long_long = yes; then
-
-$as_echo "#define CC_HAS_LONG_LONG 1" >>confdefs.h
-
+if test $gdb_cv_c_long_long != yes; then
+ # libdecnumber requires long long.
+ as_fn_error "Compiler must support long long for GDB." "$LINENO" 5
fi
# Check if the compiler and runtime support printing long longs.
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 2bfbe73..db52804 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1556,9 +1556,9 @@ AC_CACHE_CHECK([for long long support in compiler], gdb_cv_c_long_long,
[[switch (foo & 2) { case 0: return 1; }]])],
gdb_cv_c_long_long=yes,
gdb_cv_c_long_long=no)])
-if test $gdb_cv_c_long_long = yes; then
- AC_DEFINE(CC_HAS_LONG_LONG, 1,
- [Define to 1 if the compiler supports long long.])
+if test $gdb_cv_c_long_long != yes; then
+ # libdecnumber requires long long.
+ AC_MSG_ERROR([Compiler must support long long for GDB.])
fi
# Check if the compiler and runtime support printing long longs.
diff --git a/gdb/defs.h b/gdb/defs.h
index 5e8a681..369ee7a 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -125,20 +125,8 @@ typedef bfd_vma CORE_ADDR;
#else /* No BFD64 */
-#ifdef CC_HAS_LONG_LONG
#define LONGEST long long
#define ULONGEST unsigned long long
-#else
-#ifdef BFD_HOST_64_BIT
-/* BFD_HOST_64_BIT is defined for some hosts that don't have long long
- (e.g. i386-windows) so try it. */
-#define LONGEST BFD_HOST_64_BIT
-#define ULONGEST BFD_HOST_U_64_BIT
-#else
-#define LONGEST long
-#define ULONGEST unsigned long
-#endif
-#endif
#endif /* No BFD64 */
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 1f4aa55..245826f 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-09 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdbint.texinfo (Host Definition): Remove CC_HAS_LONG_LONG.
+
2012-11-29 Tom Tromey <tromey@redhat.com>
* gdb.texinfo (SVR4 Process Information): Document missing
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 34b0bec..5dbf7bf 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -2761,11 +2761,6 @@ Substitute for isatty, if not available.
@item FOPEN_RB
Define this if binary files are opened the same way as text files.
-@item CC_HAS_LONG_LONG
-@cindex @code{long long} data type
-Define this if the host C compiler supports @code{long long}. This is set
-by the @code{configure} script.
-
@item PRINTF_HAS_LONG_LONG
Define this if the host can handle printing of long long integers via
the printf format conversion specifier @code{ll}. This is set by the
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index dcfbeb7..5662cc2 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -1805,11 +1805,7 @@ add_fde (struct dwarf2_fde_table *fde_table, struct dwarf2_fde *fde)
fde_table->entries[fde_table->num_entries - 1] = fde;
}
-#ifdef CC_HAS_LONG_LONG
#define DW64_CIE_ID 0xffffffffffffffffULL
-#else
-#define DW64_CIE_ID ~0
-#endif
/* Defines the type of eh_frames that are expected to be decoded: CIE, FDE
or any of them. */
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index bf673a7..b75cfb8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2356,33 +2356,10 @@ dw2_get_primary_cu (int index)
return dwarf2_per_objfile->all_comp_units[index];
}
-/* A helper function that knows how to read a 64-bit value in a way
- that doesn't make gdb die. Returns 1 if the conversion went ok, 0
- otherwise. */
-
-static int
-extract_cu_value (const char *bytes, ULONGEST *result)
-{
- if (sizeof (ULONGEST) < 8)
- {
- int i;
-
- /* Ignore the upper 4 bytes if they are all zero. */
- for (i = 0; i < 4; ++i)
- if (bytes[i + 4] != 0)
- return 0;
-
- *result = extract_unsigned_integer (bytes, 4, BFD_ENDIAN_LITTLE);
- }
- else
- *result = extract_unsigned_integer (bytes, 8, BFD_ENDIAN_LITTLE);
- return 1;
-}
-
/* A helper for create_cus_from_index that handles a given list of
CUs. */
-static int
+static void
create_cus_from_index_list (struct objfile *objfile,
const gdb_byte *cu_list, offset_type n_elements,
struct dwarf2_section_info *section,
@@ -2396,9 +2373,9 @@ create_cus_from_index_list (struct objfile *objfile,
struct dwarf2_per_cu_data *the_cu;
ULONGEST offset, length;
- if (!extract_cu_value (cu_list, &offset)
- || !extract_cu_value (cu_list + 8, &length))
- return 0;
+ gdb_static_assert (sizeof (ULONGEST) >= 8);
+ offset = extract_unsigned_integer (cu_list, 8, BFD_ENDIAN_LITTLE);
+ length = extract_unsigned_integer (cu_list + 8, 8, BFD_ENDIAN_LITTLE);
cu_list += 2 * 8;
the_cu = OBSTACK_ZALLOC (&objfile->objfile_obstack,
@@ -2412,15 +2389,12 @@ create_cus_from_index_list (struct objfile *objfile,
the_cu->is_dwz = is_dwz;
dwarf2_per_objfile->all_comp_units[base_offset + i / 2] = the_cu;
}
-
- return 1;
}
/* Read the CU list from the mapped index, and use it to create all
- the CU objects for this objfile. Return 0 if something went wrong,
- 1 if everything went ok. */
+ the CU objects for this objfile. */
-static int
+static void
create_cus_from_index (struct objfile *objfile,
const gdb_byte *cu_list, offset_type cu_list_elements,
const gdb_byte *dwz_list, offset_type dwz_elements)
@@ -2433,21 +2407,20 @@ create_cus_from_index (struct objfile *objfile,
dwarf2_per_objfile->n_comp_units
* sizeof (struct dwarf2_per_cu_data *));
- if (!create_cus_from_index_list (objfile, cu_list, cu_list_elements,
- &dwarf2_per_objfile->info, 0, 0))
- return 0;
+ create_cus_from_index_list (objfile, cu_list, cu_list_elements,
+ &dwarf2_per_objfile->info, 0, 0);
if (dwz_elements == 0)
- return 1;
+ return;
dwz = dwarf2_get_dwz_file ();
- return create_cus_from_index_list (objfile, dwz_list, dwz_elements,
- &dwz->info, 1, cu_list_elements / 2);
+ create_cus_from_index_list (objfile, dwz_list, dwz_elements, &dwz->info, 1,
+ cu_list_elements / 2);
}
/* Create the signatured type hash table from the index. */
-static int
+static void
create_signatured_type_table_from_index (struct objfile *objfile,
struct dwarf2_section_info *section,
const gdb_byte *bytes,
@@ -2470,9 +2443,10 @@ create_signatured_type_table_from_index (struct objfile *objfile,
ULONGEST offset, type_offset_in_tu, signature;
void **slot;
- if (!extract_cu_value (bytes, &offset)
- || !extract_cu_value (bytes + 8, &type_offset_in_tu))
- return 0;
+ gdb_static_assert (sizeof (ULONGEST) >= 8);
+ offset = extract_unsigned_integer (bytes, 8, BFD_ENDIAN_LITTLE);
+ type_offset_in_tu = extract_unsigned_integer (bytes + 8, 8,
+ BFD_ENDIAN_LITTLE);
signature = extract_unsigned_integer (bytes + 16, 8, BFD_ENDIAN_LITTLE);
bytes += 3 * 8;
@@ -2495,8 +2469,6 @@ create_signatured_type_table_from_index (struct objfile *objfile,
}
dwarf2_per_objfile->signatured_types = sig_types_hash;
-
- return 1;
}
/* Read the address map data from the mapped index, and use it to
@@ -2793,9 +2765,8 @@ dwarf2_read_index (struct objfile *objfile)
}
}
- if (!create_cus_from_index (objfile, cu_list, cu_list_elements,
- dwz_list, dwz_list_elements))
- return 0;
+ create_cus_from_index (objfile, cu_list, cu_list_elements, dwz_list,
+ dwz_list_elements);
if (types_list_elements)
{
@@ -2809,10 +2780,8 @@ dwarf2_read_index (struct objfile *objfile)
section = VEC_index (dwarf2_section_info_def,
dwarf2_per_objfile->types, 0);
- if (!create_signatured_type_table_from_index (objfile, section,
- types_list,
- types_list_elements))
- return 0;
+ create_signatured_type_table_from_index (objfile, section, types_list,
+ types_list_elements);
}
create_addrmap_from_index (objfile, &local_map);
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 4021de0..a54adfd 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2222,7 +2222,7 @@ ui_printf (char *arg, struct ui_file *stream)
error (_("long double not supported in printf"));
#endif
case long_long_arg:
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
{
long long val = value_as_long (val_args[i]);
@@ -2357,7 +2357,7 @@ ui_printf (char *arg, struct ui_file *stream)
handle %p as glibc would: %#x or a literal "(nil)". */
char *p, *fmt, *fmt_p;
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
long long val = value_as_long (val_args[i]);
#else
long val = value_as_long (val_args[i]);
@@ -2392,7 +2392,7 @@ ui_printf (char *arg, struct ui_file *stream)
gdb_assert (*p == 'p' && *(p + 1) == '\0');
if (val != 0)
{
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
*fmt_p++ = 'l';
#endif
*fmt_p++ = 'l';
diff --git a/gdb/source.c b/gdb/source.c
index f272c6d..7755966 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1135,9 +1135,9 @@ symtab_to_filename (struct symtab *symtab)
const char *filename = symtab->filenamex;
if (filename == NULL)
- return NULL;
+ return NULL;
else if (filename_display_string == filename_display_basename)
- return lbasename (filename);
+ return lbasename (filename);
else if (filename_display_string == filename_display_absolute)
{
const char *retval = symtab_to_fullname (symtab);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4994fe1..de29aa3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-09 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.dwarf2/dw2-compdir-oldgcc.S: New file.
+ * gdb.dwarf2/dw2-compdir-oldgcc.exp: New file.
+
2012-12-08 Yao Qi <yao@codesourcery.com>
Pedro Alves <palves@redhat.com>
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index f8ce24d..c2fd010 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -19,7 +19,7 @@ if {![dwarf2_support]} {
return 0
}
-set testfile "dw2-dir-file-name"
+standard_testfile
set executable ${testfile}
set binfile ${objdir}/${subdir}/${executable}
set srcfile ${testfile}.c
diff --git a/gdb/version.in b/gdb/version.in
index bb9421b..2f64495 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.5.50.20121209-cvs
+7.5.50.20121210-cvs
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-10 7:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-10 7:09 [SCM] archer-jankratochvil-absdir: Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-absdir jkratoch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).