]> git.pld-linux.org Git - packages/gdb.git/blobdiff - gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
- BR: libselinux-devel (because of attach-fail-reasons-5of5 patch)
[packages/gdb.git] / gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
index f183f6dc23bbff4a7ff8c8f3d648dfce3c25e8a2..fa2f4ed15d9dcce549e13ac0ca28e487b67bc547 100644 (file)
@@ -19,6 +19,8 @@ will get:
 Attached suggestion patch how to deal with the most common "errno" symbol
 for the most common under-ggdb3 compiled programs.
 
+Original patch hooked into target_translate_tls_address.  But its inferior
+call invalidates `struct frame *' in the callers - RH BZ 690908.
 
 
 2007-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
@@ -30,134 +32,21 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
   <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
-Index: gdb-6.8.50.20090228/gdb/gdbtypes.c
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/gdbtypes.c    2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/gdbtypes.c 2009-03-02 01:01:53.000000000 +0100
-@@ -3633,6 +3633,8 @@ gdbtypes_post_init (struct gdbarch *gdba
-     init_type (TYPE_CODE_INT, 
-              gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
-              0, "int", OBJFILE_INTERNAL);
-+  builtin_type->builtin_int_ptr =
-+    make_pointer_type (builtin_type->builtin_int, NULL);
-   builtin_type->builtin_unsigned_int =
-     init_type (TYPE_CODE_INT, 
-              gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
-@@ -3742,6 +3744,12 @@ gdbtypes_post_init (struct gdbarch *gdba
-              "<text variable, no debug info>", OBJFILE_INTERNAL);
-   TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol) =
-     builtin_type->builtin_int;
-+  builtin_type->nodebug_text_symbol_errno_location =
-+    init_type (TYPE_CODE_FUNC, 1, 0, 
-+             "<text variable for __errno_location, no debug info>",
-+             OBJFILE_INTERNAL);
-+  TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol_errno_location) =
-+    builtin_type->builtin_int_ptr;
-   builtin_type->nodebug_data_symbol =
-     init_type (TYPE_CODE_INT, 
-              gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0,
-Index: gdb-6.8.50.20090228/gdb/gdbtypes.h
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/gdbtypes.h    2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/gdbtypes.h 2009-03-02 01:01:53.000000000 +0100
-@@ -1053,6 +1053,7 @@ struct builtin_type
-   /* Types used for symbols with no debug information.  */
-   struct type *nodebug_text_symbol;
-+  struct type *nodebug_text_symbol_errno_location;
-   struct type *nodebug_data_symbol;
-   struct type *nodebug_unknown_symbol;
-   struct type *nodebug_tls_symbol;
-@@ -1065,6 +1066,7 @@ struct builtin_type
-   struct type *builtin_char;
-   struct type *builtin_short;
-   struct type *builtin_int;
-+  struct type *builtin_int_ptr;
-   struct type *builtin_long;
-   struct type *builtin_signed_char;
-   struct type *builtin_unsigned_char;
-Index: gdb-6.8.50.20090228/gdb/parse.c
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/parse.c       2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/parse.c    2009-03-02 01:01:53.000000000 +0100
-@@ -508,7 +508,12 @@ write_exp_msymbol (struct minimal_symbol
-     case mst_text:
-     case mst_file_text:
-     case mst_solib_trampoline:
--      write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
-+      if (builtin_type (gdbarch)->nodebug_text_symbol_errno_location != NULL
-+          && strcmp (SYMBOL_LINKAGE_NAME (msymbol), "__errno_location") == 0)
-+      write_exp_elt_type (builtin_type (gdbarch)
-+                                        ->nodebug_text_symbol_errno_location);
-+      else
-+      write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
-       break;
-     case mst_data:
-Index: gdb-6.8.50.20090228/gdb/target.c
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/target.c      2009-03-02 01:01:44.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/target.c   2009-03-02 01:01:53.000000000 +0100
-@@ -827,6 +827,25 @@ pop_all_targets (int quitting)
-   pop_all_targets_above (dummy_stratum, quitting);
- }
-+static int
-+resolve_errno (void *arg)
-+{
-+  CORE_ADDR *arg_addr = arg;
-+  struct expression *expr;
-+  struct cleanup *old_chain = 0;
-+  struct value *val;
-+
-+  expr = parse_expression ("__errno_location()");
-+  old_chain = make_cleanup (free_current_contents, &expr);
-+  val = evaluate_expression (expr);
-+  *arg_addr = value_as_address (val);
-+  release_value (val);
-+  value_free (val);
-+  do_cleanups (old_chain);
-+
-+  return 1;
-+}
-+
- /* Using the objfile specified in OBJFILE, find the address for the
-    current thread's thread-local storage with offset OFFSET.  */
- CORE_ADDR
-@@ -917,7 +936,28 @@ target_translate_tls_address (struct obj
-   /* It wouldn't be wrong here to try a gdbarch method, too; finding
-      TLS is an ABI-specific thing.  But we don't do that yet.  */
-   else
--    error (_("Cannot find thread-local variables on this target"));
-+    {
-+      struct minimal_symbol *msymbol;
-+
-+      msymbol = lookup_minimal_symbol ("errno", NULL, NULL);
-+      if (msymbol != NULL
-+        && SYMBOL_VALUE_ADDRESS (msymbol) == offset
-+        && (SYMBOL_OBJ_SECTION (msymbol)->objfile == objfile
-+            || (objfile->separate_debug_objfile != NULL
-+                && SYMBOL_OBJ_SECTION (msymbol)->objfile
-+                   == objfile->separate_debug_objfile)
-+            || (objfile->separate_debug_objfile_backlink != NULL
-+                && SYMBOL_OBJ_SECTION (msymbol)->objfile
-+                   == objfile->separate_debug_objfile_backlink)))
-+      {
-+        if (!catch_errors (resolve_errno, (void *) &addr, "",
-+                           RETURN_MASK_ALL))
-+          error (_("TLS symbol `errno' not resolved for non-TLS program."
-+                   "  You should compile the program with `gcc -pthread'."));
-+      }
-+      else
-+      error (_("Cannot find thread-local variables on this target"));
-+    }
+--- a/gdb/printcmd.c
++++ b/gdb/printcmd.c
+@@ -967,6 +967,8 @@ print_command_1 (char *exp, int inspect, int voidprint)
  
-   return addr;
- }
-Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+   if (exp && *exp)
+     {
++      if (strcmp (exp, "errno") == 0)
++      exp = "*((int *(*) (void)) __errno_location) ()";
+       expr = parse_expression (exp);
+       old_chain = make_cleanup (free_current_contents, &expr);
+       cleanup = 1;
+Index: gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c   2009-03-02 01:01:53.000000000 +0100
++++ gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.c       2011-03-29 10:55:35.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -187,11 +76,11 @@ Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 +
 +  return 0;   /* breakpoint */
 +}
-Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+Index: gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2009-03-02 01:01:53.000000000 +0100
-@@ -0,0 +1,67 @@
++++ gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.exp     2011-03-29 10:55:35.000000000 +0200
+@@ -0,0 +1,60 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -207,13 +96,6 @@ Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+set prms_id 0
-+set bug_id 0
-+
 +set testfile dw2-errno
 +set srcfile ${testfile}.c
 +set binfile ${objdir}/${subdir}/${testfile}
This page took 0.096389 seconds and 4 git commands to generate.