[SCM] archer-jankratochvil-misc: Revert "Updated:"

[SCM] archer-jankratochvil-misc: Revert "Updated:"

[jkratoch]

The branch, archer-jankratochvil-misc has been updated
       via  5c149522cf24b33ad66b3ec502e8a90eb6a16dfa (commit)
      from  e25caae08e0092125d06450426bd03cb57f6eb0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 5c149522cf24b33ad66b3ec502e8a90eb6a16dfa
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Dec 2 15:51:50 2008 +0100

    Revert "Updated:"
    
    This reverts commit d2ba405b04ed007f0a594d1111299482eeefe28d.
    
    Committed upstream:
    http://sourceware.org/ml/gdb-patches/2008-12/msg00016.html
    http://sourceware.org/ml/gdb-cvs/2008-12/msg00009.html

-----------------------------------------------------------------------

Summary of changes:
 gdb/findvar.c                     |    7 -------
 gdb/printcmd.c                    |   23 +++++++----------------
 gdb/testsuite/gdb.threads/tls.c   |    9 ---------
 gdb/testsuite/gdb.threads/tls.exp |   18 +-----------------
 gdb/testsuite/gdb.threads/tls2.c  |   28 ----------------------------
 5 files changed, 8 insertions(+), 77 deletions(-)
 delete mode 100644 gdb/testsuite/gdb.threads/tls2.c

First 500 lines of diff:
diff --git a/gdb/findvar.c b/gdb/findvar.c
index f7b6e63..4796721 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -34,7 +34,6 @@
 #include "regcache.h"
 #include "user-regs.h"
 #include "block.h"
-#include "objfiles.h"
 
 /* Basic byte-swapping routines.  GDB has needed these for a long time...
    All extract a target-format integer at ADDR which is LEN bytes long.  */
@@ -537,7 +536,6 @@ read_var_value (struct symbol *var, struct frame_info *frame)
     case LOC_UNRESOLVED:
       {
 	struct minimal_symbol *msym;
-	struct obj_section *obj_section;
 
 	msym = lookup_minimal_symbol (SYMBOL_LINKAGE_NAME (var), NULL, NULL);
 	if (msym == NULL)
@@ -547,11 +545,6 @@ read_var_value (struct symbol *var, struct frame_info *frame)
 					   SYMBOL_OBJ_SECTION (msym));
 	else
 	  addr = SYMBOL_VALUE_ADDRESS (msym);
-
-	obj_section = SYMBOL_OBJ_SECTION (msym);
-	if (obj_section
-	    && (obj_section->the_bfd_section->flags & SEC_THREAD_LOCAL) != 0)
-	  addr = target_translate_tls_address (obj_section->objfile, addr);
       }
       break;
 
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 6d6b915..81638fb 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1241,25 +1241,16 @@ address_info (char *exp, int from_tty)
 	else
 	  {
 	    section = SYMBOL_OBJ_SECTION (msym);
+	    printf_filtered (_("static storage at address "));
 	    load_addr = SYMBOL_VALUE_ADDRESS (msym);
-
-	    if (section
-		&& (section->the_bfd_section->flags & SEC_THREAD_LOCAL) != 0)
-	      printf_filtered (_("a thread-local variable at offset %s "
-				 "in the thread-local storage for `%s'"),
-			       paddr_nz (load_addr), section->objfile->name);
-	    else
+	    fputs_filtered (paddress (load_addr), gdb_stdout);
+	    if (section_is_overlay (section))
 	      {
-		printf_filtered (_("static storage at address "));
+		load_addr = overlay_unmapped_address (load_addr, section);
+		printf_filtered (_(",\n -- loaded at "));
 		fputs_filtered (paddress (load_addr), gdb_stdout);
-		if (section_is_overlay (section))
-		  {
-		    load_addr = overlay_unmapped_address (load_addr, section);
-		    printf_filtered (_(",\n -- loaded at "));
-		    fputs_filtered (paddress (load_addr), gdb_stdout);
-		    printf_filtered (_(" in overlay section %s"),
-				     section->the_bfd_section->name);
-		  }
+		printf_filtered (_(" in overlay section %s"),
+				 section->the_bfd_section->name);
 	      }
 	  }
       }
diff --git a/gdb/testsuite/gdb.threads/tls.c b/gdb/testsuite/gdb.threads/tls.c
index 8f2443c..9b2145e 100644
--- a/gdb/testsuite/gdb.threads/tls.c
+++ b/gdb/testsuite/gdb.threads/tls.c
@@ -20,9 +20,6 @@
 __thread int a_thread_local;
 __thread int another_thread_local;
 
-/* psymtabs->symtabs resolving check.  */
-extern __thread int file2_thread_local;
-
 /* Global variable just for info addr in gdb.  */
 int a_global;
 
@@ -122,12 +119,6 @@ void *spin( vp )
 }
 
 void
-function_referencing_file2_thread_local (void)
-{
-  file2_thread_local = file2_thread_local;
-}
-
-void
 do_pass()
 {
     int i;
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index ead852a..614c06e 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -15,9 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 set testfile tls
-set testfile2 tls2
 set srcfile ${testfile}.c
-set srcfile2 ${testfile2}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if [istarget "*-*-linux"] then {
@@ -26,7 +24,7 @@ if [istarget "*-*-linux"] then {
     set target_cflags ""
 }
 
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
     return -1
 }
 
@@ -286,20 +284,6 @@ gdb_test "info address a_global" \
 setup_kfail "gdb/1294" "*-*-*"
 gdb_test "info address me" ".*me.*is a variable at offset.*" "info address me"
 
-
-# Test LOC_UNRESOLVED references resolving for `extern' TLS variables.
-
-gdb_test "p a_thread_local" " = \[0-9\]+"
-# Here it could crash with: Cannot access memory at address 0x0
-gdb_test "p file2_thread_local" " = \[0-9\]+"
-# Depending on the current lookup scope we get LOC_UNRESOLVED or LOC_COMPUTED
-# both printing:
-# Symbol "file2_thread_local" is a thread-local variable at offset 8 in the thread-local storage for `.../gdb.threads/tls'.
-gdb_test "info address file2_thread_local" "Symbol \"file2_thread_local\" is a thread-local variable.*"
-# Here it could also crash with: Cannot access memory at address 0x0
-gdb_test "p a_thread_local" " = \[0-9\]+" "p a_thread_local second time"
-gdb_test "info address a_thread_local" "Symbol \"a_thread_local\" is a thread-local variable.*"
-
 # Done!
 #
 gdb_exit
diff --git a/gdb/testsuite/gdb.threads/tls2.c b/gdb/testsuite/gdb.threads/tls2.c
deleted file mode 100644
index f87ec2f..0000000
--- a/gdb/testsuite/gdb.threads/tls2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2008 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   Please email any bugs, comments, and/or additions to this file to:
-   bug-gdb@prep.ai.mit.edu  */
-
-extern __thread int a_thread_local;
-__thread int file2_thread_local;
-
-void
-function_referencing_a_thread_local (void)
-{
-  a_thread_local = a_thread_local;
-}


hooks/post-receive
--
Repository for Project Archer.