* gdbarch.sh (sofun_address_maybe_missing): New gdbarch variable.
authorUlrich Weigand <uweigand@de.ibm.com>
Fri, 19 Oct 2007 12:26:35 +0000 (12:26 +0000)
committerUlrich Weigand <uweigand@de.ibm.com>
Fri, 19 Oct 2007 12:26:35 +0000 (12:26 +0000)
* gdbarch.c, gdbarch.h: Regenerate.
* dbxread.c (find_stab_function_addr): Define unconditionally.
(read_dbx_symtab): Use gdbarch_sofun_address_maybe_missing
instead of SOFUN_ADDRESS_MAYBE_MISSING.
(end_psymtab): Likewise.
(process_one_symbol): Likewise.
* mdebugread.c (parse_partial_symbols): Likewise.

* symtab.h (struct minimal_symbol): Always define "filename" member.
* elfread.c (elf_symtab_read): Use msym->filename unconditionally.
* minsyms.c (lookup_minimal_symbol): Likewise.
* symmisc.c (dump_msymbols): Likewise.

* config/i386/i386sol2.mt (DEPRECATED_TM_FILE): Remove.
* config/i386/linux.mt (DEPRECATED_TM_FILE): Remove.
* config/i386/tm-i386sol2.h: Remove file.
* config/i386/tm-linux.h: Remove file.
* i386-linux-tdep.c (i386_linux_init_abi): Add call to
set_gdbarch_sofun_address_maybe_missing.
* i386-sol2-tdep.c (i386_sol2_init_abi): Likewise.

* config/powerpc/linux.mt (DEPRECATED_TM_FILE): Remove.
* config/powerpc/nbsd.mt (DEPRECATED_TM_FILE): Remove.
* config/powerpc/obsd.mt (DEPRECATED_TM_FILE): Remove.
* config/powerpc/ppc-eabi.mt (DEPRECATED_TM_FILE): Remove.
* config/powerpc/ppc-sim.mt (DEPRECATED_TM_FILE): Remove.
* config/powerpc/tm-ppc-eabi.h: Remove file.
* rs6000-tdep.c (rs6000_gdbarch_init): Add call to
set_gdbarch_sofun_address_maybe_missing.

* config/sparc/sol2-64.mt (DEPRECATED_TM_FILE): Remove.
* config/sparc/sol2.mt (DEPRECATED_TM_FILE): Remove.
* config/sparc/tm-sol2.h: Remove file.
* sparc64-sol2-tdep.c (sparc64_sol2_init_abi): Add call to
set_gdbarch_sofun_address_maybe_missing.
* sparc-sol2-tdep.c (sparc32_sol2_init_abi): Likewise.

doc/ChangeLog:

* gdbarch.texi (Target Conditionals): Remove documentation of
SOFUN_ADDRESS_MAYBE_MISSING, replaced by ...
(Compiler Characteristics): ... documentation of
set_gdbarch_sofun_address_maybe_missing.

30 files changed:
gdb/ChangeLog
gdb/config/i386/i386sol2.mt
gdb/config/i386/linux.mt
gdb/config/i386/tm-i386sol2.h [deleted file]
gdb/config/i386/tm-linux.h [deleted file]
gdb/config/powerpc/linux.mt
gdb/config/powerpc/nbsd.mt
gdb/config/powerpc/obsd.mt
gdb/config/powerpc/ppc-eabi.mt
gdb/config/powerpc/ppc-sim.mt
gdb/config/powerpc/tm-ppc-eabi.h [deleted file]
gdb/config/sparc/sol2-64.mt
gdb/config/sparc/sol2.mt
gdb/config/sparc/tm-sol2.h [deleted file]
gdb/dbxread.c
gdb/doc/ChangeLog
gdb/doc/gdbint.texinfo
gdb/elfread.c
gdb/gdbarch.c
gdb/gdbarch.h
gdb/gdbarch.sh
gdb/i386-linux-tdep.c
gdb/i386-sol2-tdep.c
gdb/mdebugread.c
gdb/minsyms.c
gdb/rs6000-tdep.c
gdb/sparc-sol2-tdep.c
gdb/sparc64-sol2-tdep.c
gdb/symmisc.c
gdb/symtab.h

index 69491a26511acff82c9a00f741460d669926a353..1081ea7b943630a0dab32316f0f86260d2c7d7a0 100644 (file)
@@ -1,3 +1,43 @@
+2007-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * gdbarch.sh (sofun_address_maybe_missing): New gdbarch variable.
+       * gdbarch.c, gdbarch.h: Regenerate.
+       * dbxread.c (find_stab_function_addr): Define unconditionally.
+       (read_dbx_symtab): Use gdbarch_sofun_address_maybe_missing
+       instead of SOFUN_ADDRESS_MAYBE_MISSING.
+       (end_psymtab): Likewise.
+       (process_one_symbol): Likewise.
+       * mdebugread.c (parse_partial_symbols): Likewise.
+
+       * symtab.h (struct minimal_symbol): Always define "filename" member.
+       * elfread.c (elf_symtab_read): Use msym->filename unconditionally.
+       * minsyms.c (lookup_minimal_symbol): Likewise.
+       * symmisc.c (dump_msymbols): Likewise.
+
+       * config/i386/i386sol2.mt (DEPRECATED_TM_FILE): Remove.
+       * config/i386/linux.mt (DEPRECATED_TM_FILE): Remove.
+       * config/i386/tm-i386sol2.h: Remove file.
+       * config/i386/tm-linux.h: Remove file.
+       * i386-linux-tdep.c (i386_linux_init_abi): Add call to
+       set_gdbarch_sofun_address_maybe_missing.
+       * i386-sol2-tdep.c (i386_sol2_init_abi): Likewise.
+
+       * config/powerpc/linux.mt (DEPRECATED_TM_FILE): Remove.
+       * config/powerpc/nbsd.mt (DEPRECATED_TM_FILE): Remove.
+       * config/powerpc/obsd.mt (DEPRECATED_TM_FILE): Remove.
+       * config/powerpc/ppc-eabi.mt (DEPRECATED_TM_FILE): Remove.
+       * config/powerpc/ppc-sim.mt (DEPRECATED_TM_FILE): Remove.
+       * config/powerpc/tm-ppc-eabi.h: Remove file.
+       * rs6000-tdep.c (rs6000_gdbarch_init): Add call to
+       set_gdbarch_sofun_address_maybe_missing.
+
+       * config/sparc/sol2-64.mt (DEPRECATED_TM_FILE): Remove.
+       * config/sparc/sol2.mt (DEPRECATED_TM_FILE): Remove.
+       * config/sparc/tm-sol2.h: Remove file.
+       * sparc64-sol2-tdep.c (sparc64_sol2_init_abi): Add call to
+       set_gdbarch_sofun_address_maybe_missing.
+       * sparc-sol2-tdep.c (sparc32_sol2_init_abi): Likewise.
+
 2007-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * gdbarch.sh (static_transform_name): New gdbarch callback.
index 30360d2e149b9729dc4fa45ad1fa9f40892ee8ce..8e247236eded9b3aed9472c8c1d802f94dd494ca 100644 (file)
@@ -1,4 +1,3 @@
 # Target: Solaris x86
 TDEPFILES= i386-tdep.o i387-tdep.o i386-sol2-tdep.o sol2-tdep.o \
        corelow.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-i386sol2.h
index 2874f0c44adc630bc5444051aaf7b713090c3adc..17eeab103b4c636a841673cbaa26da7cf2d63a87 100644 (file)
@@ -1,4 +1,3 @@
 # Target: Intel 386 running GNU/Linux
 TDEPFILES= i386-tdep.o i386-linux-tdep.o glibc-tdep.o i387-tdep.o \
        solib.o solib-svr4.o symfile-mem.o corelow.o
-DEPRECATED_TM_FILE= tm-linux.h
diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
deleted file mode 100644 (file)
index 02f299d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Macro definitions for GDB on an Intel i386 running Solaris 2.
-
-   Copyright 1998, 1999, 2000, 2004, 2007 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#ifndef TM_I386SOL2_H
-#define TM_I386SOL2_H 1
-
-/* The SunPRO compiler puts out 0 instead of the address in N_SO symbols,
-   and for SunPRO 3.0, N_FUN symbols too.  */
-#define SOFUN_ADDRESS_MAYBE_MISSING
-
-#endif /* tm-i386sol2.h */
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
deleted file mode 100644 (file)
index 6ba682a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Definitions to target GDB to GNU/Linux on 386.
-
-   Copyright 1992, 1993, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2004, 2007
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#ifndef TM_LINUX_H
-#define TM_LINUX_H
-
-/* N_FUN symbols in shared libaries have 0 for their values and need
-   to be relocated. */
-#define SOFUN_ADDRESS_MAYBE_MISSING
-
-#endif /* #ifndef TM_LINUX_H */
index 752a9379ea48ad3aeb14b6bc1a2d6ee84cf666c8..846f8c3e6abd486b9e3359fec14d7bc34b4ab2bb 100644 (file)
@@ -1,7 +1,6 @@
 # Target: Motorola PPC on Linux
 TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \
        solib-svr4.o solib-legacy.o corelow.o symfile-mem.o
-DEPRECATED_TM_FILE= tm-ppc-eabi.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
index 8cdd39d817c0c309b8ab4cdf662366d1551a0030..6aa2970416319a2305c766646da97cca880ceaaf 100644 (file)
@@ -1,7 +1,6 @@
 # Target: NetBSD/powerpc
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o \
        corelow.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-ppc-eabi.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
index fbe61d48f5fa186f7875a234111fe930c0e2b396..58640f23b59829f561c45cfee7a03ec86905b0ca 100644 (file)
@@ -1,4 +1,3 @@
 # Target: OpenBSD/powerpc
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcobsd-tdep.o \
        corelow.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-ppc-eabi.h
index 25f8cba1c855e138dc8fb04f07670ab10891f37f..85de062fa72a1fd1ac5ac3679965593eeaa7db1a 100644 (file)
@@ -1,3 +1,2 @@
 # Target: PowerPC running eabi
 TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-sysv-tdep.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-ppc-eabi.h
index e78a64d99b4febbeec238a01ab106d7354deb668..c33134562ddb9cff949b61396a5c9ffd48f8e172 100644 (file)
@@ -1,6 +1,5 @@
 # Target: PowerPC running eabi and including the simulator
 TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-sysv-tdep.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-ppc-eabi.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h
deleted file mode 100644 (file)
index 214b010..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Macro definitions for Power PC running embedded ABI.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2007
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#ifndef TM_PPC_EABI_H
-#define TM_PPC_EABI_H
-
-/* The value of symbols of type N_SO and N_FUN maybe null when 
-   it shouldn't be. */
-#define SOFUN_ADDRESS_MAYBE_MISSING
-
-#endif /* TM_PPC_EABI_H */
index ced0d2c76bb9670776d44cc1b4af94e55dc5ff99..d5fa1efd363f5f922f9577316846408cdf57a87c 100644 (file)
@@ -1,4 +1,3 @@
 # Target: Solaris UltraSPARC
 TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o sparc-sol2-tdep.o \
        sol2-tdep.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-sol2.h
index b6cd168d60b8656ec262f2527f97bc5956fc3525..4382c50071dbb34ab3963b16528db4dd06a99fa5 100644 (file)
@@ -1,3 +1,2 @@
 # Target: Solaris SPARC
 TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= tm-sol2.h
diff --git a/gdb/config/sparc/tm-sol2.h b/gdb/config/sparc/tm-sol2.h
deleted file mode 100644 (file)
index 28746af..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Target-dependent definitions for Solaris SPARC.
-
-   Copyright 2003, 2004, 2007 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#ifndef TM_SOL2_H
-#define TM_SOL2_H
-
-/* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop,
-   SunPRO) compiler puts out 0 instead of the address in N_SO stabs.
-   Starting with SunPRO 3.0, the compiler does this for N_FUN stabs
-   too.  */
-#define SOFUN_ADDRESS_MAYBE_MISSING
-
-#endif /* tm-sol2.h */
index a51fe9d757eabb8b579dc35f47fea5a97a7ba839..d94922e1f0b18fdb755efd8f7388b9239a573582 100644 (file)
@@ -1116,7 +1116,6 @@ read_dbx_dynamic_symtab (struct objfile *objfile)
   do_cleanups (back_to);
 }
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
 static CORE_ADDR
 find_stab_function_addr (char *namestring, char *filename,
                         struct objfile *objfile)
@@ -1160,7 +1159,6 @@ find_stab_function_addr (char *namestring, char *filename,
 
   return msym == NULL ? 0 : SYMBOL_VALUE_ADDRESS (msym);
 }
-#endif /* SOFUN_ADDRESS_MAYBE_MISSING */
 
 static void
 function_outside_compilation_unit_complaint (const char *arg1)
@@ -1463,21 +1461,19 @@ read_dbx_symtab (struct objfile *objfile)
 
            prev_textlow_not_set = textlow_not_set;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
            /* A zero value is probably an indication for the SunPRO 3.0
               compiler. end_psymtab explicitly tests for zero, so
               don't relocate it.  */
 
-           if (nlist.n_value == 0)
+           if (nlist.n_value == 0
+               && gdbarch_sofun_address_maybe_missing (current_gdbarch))
              {
                textlow_not_set = 1;
                valu = 0;
              }
            else
              textlow_not_set = 0;
-#else
-           textlow_not_set = 0;
-#endif
+
            past_first_source_file = 1;
 
            if (prev_so_symnum != symnum - 1)
@@ -1832,11 +1828,11 @@ read_dbx_symtab (struct objfile *objfile)
                                       SECT_OFF_TEXT (objfile));
            /* Kludges for ELF/STABS with Sun ACC */
            last_function_name = namestring;
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
            /* Do not fix textlow==0 for .o or NLM files, as 0 is a legit
               value for the bottom of the text seg in those cases. */
            if (nlist.n_value == ANOFFSET (objfile->section_offsets, 
-                                          SECT_OFF_TEXT (objfile)))
+                                          SECT_OFF_TEXT (objfile))
+               && gdbarch_sofun_address_maybe_missing (current_gdbarch))
              {
                CORE_ADDR minsym_valu = 
                  find_stab_function_addr (namestring, 
@@ -1850,12 +1846,12 @@ read_dbx_symtab (struct objfile *objfile)
                if (minsym_valu != 0)
                  nlist.n_value = minsym_valu;
              }
-           if (pst && textlow_not_set)
+           if (pst && textlow_not_set
+               && gdbarch_sofun_address_maybe_missing (current_gdbarch))
              {
                pst->textlow = nlist.n_value;
                textlow_not_set = 0;
              }
-#endif
            /* End kludge.  */
 
            /* Keep track of the start of the last function so we
@@ -1900,11 +1896,11 @@ read_dbx_symtab (struct objfile *objfile)
                                       SECT_OFF_TEXT (objfile));
            /* Kludges for ELF/STABS with Sun ACC */
            last_function_name = namestring;
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
            /* Do not fix textlow==0 for .o or NLM files, as 0 is a legit
               value for the bottom of the text seg in those cases. */
            if (nlist.n_value == ANOFFSET (objfile->section_offsets, 
-                                          SECT_OFF_TEXT (objfile)))
+                                          SECT_OFF_TEXT (objfile))
+               && gdbarch_sofun_address_maybe_missing (current_gdbarch))
              {
                CORE_ADDR minsym_valu = 
                  find_stab_function_addr (namestring, 
@@ -1918,12 +1914,12 @@ read_dbx_symtab (struct objfile *objfile)
                if (minsym_valu != 0)
                  nlist.n_value = minsym_valu;
              }
-           if (pst && textlow_not_set)
+           if (pst && textlow_not_set
+               && gdbarch_sofun_address_maybe_missing (current_gdbarch))
              {
                pst->textlow = nlist.n_value;
                textlow_not_set = 0;
              }
-#endif
            /* End kludge.  */
 
            /* Keep track of the start of the last function so we
@@ -2049,12 +2045,11 @@ read_dbx_symtab (struct objfile *objfile)
          continue;
 
          case N_ENDM:
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
          /* Solaris 2 end of module, finish current partial symbol table.
             end_psymtab will set pst->texthigh to the proper value, which
             is necessary if a module compiled without debugging info
             follows this module.  */
-         if (pst)
+         if (pst && gdbarch_sofun_address_maybe_missing (current_gdbarch))
          {
            end_psymtab (pst, psymtab_include_list, includes_used,
                         symnum * symbol_size,
@@ -2064,7 +2059,6 @@ read_dbx_symtab (struct objfile *objfile)
            includes_used = 0;
            dependencies_used = 0;
          }
-#endif
          continue;
 
          case N_RBRAC:
@@ -2186,7 +2180,6 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes,
     LDSYMLEN (pst) = capping_symbol_offset - LDSYMOFF (pst);
   pst->texthigh = capping_text;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
   /* Under Solaris, the N_SO symbols always have a value of 0,
      instead of the usual address of the .o file.  Therefore,
      we have to do some tricks to fill in texthigh and textlow.
@@ -2202,7 +2195,8 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes,
      a reliable texthigh by taking the address plus size of the
      last function in the file.  */
 
-  if (pst->texthigh == 0 && last_function_name)
+  if (pst->texthigh == 0 && last_function_name
+      && gdbarch_sofun_address_maybe_missing (current_gdbarch))
     {
       char *p;
       int n;
@@ -2233,8 +2227,10 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes,
       last_function_name = NULL;
     }
 
+  if (!gdbarch_sofun_address_maybe_missing (current_gdbarch))
+    ;
   /* this test will be true if the last .o file is only data */
-  if (textlow_not_set)
+  else if (textlow_not_set)
     pst->textlow = pst->texthigh;
   else
     {
@@ -2259,7 +2255,6 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes,
     }
 
   /* End of kludge for patching Solaris textlow and texthigh.  */
-#endif /* SOFUN_ADDRESS_MAYBE_MISSING.  */
 
   pst->n_global_syms =
     objfile->global_psymbols.next - (objfile->global_psymbols.list + pst->globals_offset);
@@ -3081,12 +3076,12 @@ no enclosing block"));
            case 'F':
              function_stab_type = type;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
              /* Deal with the SunPRO 3.0 compiler which omits the
                 address from N_FUN symbols.  */
              if (type == N_FUN
                  && valu == ANOFFSET (section_offsets,
-                                      SECT_OFF_TEXT (objfile)))
+                                      SECT_OFF_TEXT (objfile))
+                 && gdbarch_sofun_address_maybe_missing (current_gdbarch))
                {
                  CORE_ADDR minsym_valu = 
                    find_stab_function_addr (name, last_source_file, objfile);
@@ -3100,7 +3095,6 @@ no enclosing block"));
                  if (minsym_valu != 0)
                    valu = minsym_valu;
                }
-#endif
 
              if (block_address_function_relative)
                /* For Solaris 2 compilers, the block addresses and
index daa3f2ea500a38a11bbb9959f88df94f9894f799..a209e28421618f2dffe60ee23185d0e19fee4e22 100644 (file)
@@ -1,3 +1,10 @@
+2007-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * gdbarch.texi (Target Conditionals): Remove documentation of
+       SOFUN_ADDRESS_MAYBE_MISSING, replaced by ...
+       (Compiler Characteristics): ... documentation of
+       set_gdbarch_sofun_address_maybe_missing.
+
 2007-10-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdbint.texinfo (Target Conditionals): Use
index 7c9b51989b927887aa7b9f6d0f80fc3f8ae91186..24e9e4f17fcbd2e34a58d572ca4e9f27d2c49b0e 100644 (file)
@@ -3264,6 +3264,38 @@ See @file{mips-tdep.c}.  It does not do what you want.
 @node Compiler Characteristics
 @section Compiler Characteristics
 
+@item set_gdbarch_sofun_address_maybe_missing (@var{gdbarch}, @var{set})
+@findex set_gdbarch_sofun_address_maybe_missing
+Somebody clever observed that, the more actual addresses you have in the
+debug information, the more time the linker has to spend relocating
+them.  So whenever there's some other way the debugger could find the
+address it needs, you should omit it from the debug info, to make
+linking faster.
+
+Calling @code{set_gdbarch_sofun_address_maybe_missing} with a non-zero
+argument @var{set} indicates that a particular set of hacks of this sort
+are in use, affecting @code{N_SO} and @code{N_FUN} entries in stabs-format
+debugging information.  @code{N_SO} stabs mark the beginning and ending
+addresses of compilation units in the text segment.  @code{N_FUN} stabs
+mark the starts and ends of functions.
+
+In this case, @value{GDBN} assumes two things:
+
+@itemize @bullet
+@item
+@code{N_FUN} stabs have an address of zero.  Instead of using those
+addresses, you should find the address where the function starts by
+taking the function name from the stab, and then looking that up in the
+minsyms (the linker/assembler symbol table).  In other words, the stab
+has the name, and the linker/assembler symbol table is the only place
+that carries the address.
+
+@item
+@code{N_SO} stabs have an address of zero, too.  You just look at the
+@code{N_FUN} stabs that appear before and after the @code{N_SO} stab, and
+guess the starting and ending addresses of the compilation unit from them.
+@end itemize
+
 @node Target Conditionals
 @section Target Conditionals
 
@@ -3825,38 +3857,6 @@ A function that inserts or removes (depending on
 the next instruction. See @file{sparc-tdep.c} and @file{rs6000-tdep.c}
 for examples.
 
-@item SOFUN_ADDRESS_MAYBE_MISSING
-@findex SOFUN_ADDRESS_MAYBE_MISSING
-Somebody clever observed that, the more actual addresses you have in the
-debug information, the more time the linker has to spend relocating
-them.  So whenever there's some other way the debugger could find the
-address it needs, you should omit it from the debug info, to make
-linking faster.
-
-@code{SOFUN_ADDRESS_MAYBE_MISSING} indicates that a particular set of
-hacks of this sort are in use, affecting @code{N_SO} and @code{N_FUN}
-entries in stabs-format debugging information.  @code{N_SO} stabs mark
-the beginning and ending addresses of compilation units in the text
-segment.  @code{N_FUN} stabs mark the starts and ends of functions.
-
-@code{SOFUN_ADDRESS_MAYBE_MISSING} means two things:
-
-@itemize @bullet
-@item
-@code{N_FUN} stabs have an address of zero.  Instead, you should find the
-addresses where the function starts by taking the function name from
-the stab, and then looking that up in the minsyms (the
-linker/assembler symbol table).  In other words, the stab has the
-name, and the linker/assembler symbol table is the only place that carries
-the address.
-
-@item
-@code{N_SO} stabs have an address of zero, too.  You just look at the
-@code{N_FUN} stabs that appear before and after the @code{N_SO} stab,
-and guess the starting and ending addresses of the compilation unit from
-them.
-@end itemize
-
 @item int gdbarch_pc_regnum (@var{gdbarch})
 @findex gdbarch_pc_regnum
 If the program counter is kept in a register, then let this function return
index 9e3ed6cbad3dc3fe71ca86ae25b0597f89c05890..7b317b8675e264fe64dbb38fcd13a5cfb1b5dc40 100644 (file)
@@ -213,10 +213,8 @@ elf_symtab_read (struct objfile *objfile, int dynamic,
   /* If filesym is nonzero, it points to a file symbol, but we haven't
      seen any section info for it yet.  */
   asymbol *filesym = 0;
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
   /* Name of filesym, as saved on the objfile_obstack.  */
   char *filesymname = obsavestring ("", 0, &objfile->objfile_obstack);
-#endif
   struct dbx_symfile_info *dbx = objfile->deprecated_sym_stab_info;
   int stripped = (bfd_get_symcount (objfile->obfd) == 0);
 
@@ -258,10 +256,8 @@ elf_symtab_read (struct objfile *objfile, int dynamic,
          msym = record_minimal_symbol
            ((char *) sym->name, symaddr,
             mst_solib_trampoline, sym->section, objfile);
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
          if (msym != NULL)
            msym->filename = filesymname;
-#endif
          continue;
        }
 
@@ -281,11 +277,9 @@ elf_symtab_read (struct objfile *objfile, int dynamic,
              sectinfo = NULL;
            }
          filesym = sym;
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
          filesymname =
            obsavestring ((char *) filesym->name, strlen (filesym->name),
                          &objfile->objfile_obstack);
-#endif
        }
       else if (sym->flags & BSF_SECTION_SYM)
        continue;
@@ -476,10 +470,8 @@ elf_symtab_read (struct objfile *objfile, int dynamic,
              unsigned long size = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;
              MSYMBOL_SIZE(msym) = size;
            }
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
          if (msym != NULL)
            msym->filename = filesymname;
-#endif
          gdbarch_elf_make_msymbol_special (current_gdbarch, sym, msym);
        }
     }
index 818e055d7f8d043faa3a78a6d16104d81cf924e6..4759236d5b5b3c0678673189588366c8a5174e55 100644 (file)
@@ -228,6 +228,7 @@ struct gdbarch
   gdbarch_overlay_update_ftype *overlay_update;
   gdbarch_core_read_description_ftype *core_read_description;
   gdbarch_static_transform_name_ftype *static_transform_name;
+  int sofun_address_maybe_missing;
 };
 
 
@@ -348,6 +349,7 @@ struct gdbarch startup_gdbarch =
   0,  /* overlay_update */
   0,  /* core_read_description */
   0,  /* static_transform_name */
+  0,  /* sofun_address_maybe_missing */
   /* startup_gdbarch() */
 };
 
@@ -593,6 +595,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch)
   /* Skip verify of overlay_update, has predicate */
   /* Skip verify of core_read_description, has predicate */
   /* Skip verify of static_transform_name, has predicate */
+  /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */
   buf = ui_file_xstrdup (log, &dummy);
   make_cleanup (xfree, buf);
   if (strlen (buf) > 0)
@@ -977,6 +980,9 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: software_single_step = <0x%lx>\n",
                       (long) current_gdbarch->software_single_step);
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: sofun_address_maybe_missing = %s\n",
+                      paddr_d (current_gdbarch->sofun_address_maybe_missing));
   fprintf_unfiltered (file,
                       "gdbarch_dump: sp_regnum = %s\n",
                       paddr_d (current_gdbarch->sp_regnum));
@@ -2964,6 +2970,23 @@ set_gdbarch_static_transform_name (struct gdbarch *gdbarch,
   gdbarch->static_transform_name = static_transform_name;
 }
 
+int
+gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch)
+{
+  gdb_assert (gdbarch != NULL);
+  /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_sofun_address_maybe_missing called\n");
+  return gdbarch->sofun_address_maybe_missing;
+}
+
+void
+set_gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch,
+                                         int sofun_address_maybe_missing)
+{
+  gdbarch->sofun_address_maybe_missing = sofun_address_maybe_missing;
+}
+
 
 /* Keep a registry of per-architecture data-pointers required by GDB
    modules. */
index 412e74fd97a804c037d439598dd0773d8cb1c00f..f207a50f4488bcaef680256ca34748e0dc413bd3 100644 (file)
@@ -672,6 +672,11 @@ typedef char * (gdbarch_static_transform_name_ftype) (char *name);
 extern char * gdbarch_static_transform_name (struct gdbarch *gdbarch, char *name);
 extern void set_gdbarch_static_transform_name (struct gdbarch *gdbarch, gdbarch_static_transform_name_ftype *static_transform_name);
 
+/* Set if the address in N_SO or N_FUN stabs may be zero. */
+
+extern int gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch);
+extern void set_gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch, int sofun_address_maybe_missing);
+
 extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch);
 
 
index 965bd9b7c88f320ec16bb1fc1b8d4c7da58192b0..bcf9f77e7e071d06075db3097707e441760fcc5b 100755 (executable)
@@ -641,6 +641,8 @@ M::const struct target_desc *:core_read_description:struct target_ops *target, b
 
 # Handle special encoding of static variables in stabs debug info.
 F::char *:static_transform_name:char *name:name
+# Set if the address in N_SO or N_FUN stabs may be zero.
+v::int:sofun_address_maybe_missing:::0:0::0
 EOF
 }
 
index 296a35dca73c015429b82b364926c36e83255deb..aacc74c7d18fd5fbc988c8e6ca428b95f9f4e3eb 100644 (file)
@@ -429,6 +429,10 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sc_reg_offset = i386_linux_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (i386_linux_sc_reg_offset);
 
+  /* N_FUN symbols in shared libaries have 0 for their values and need
+     to be relocated. */
+  set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
   /* GNU/Linux uses SVR4-style shared libraries.  */
   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
   set_solib_svr4_fetch_link_map_offsets
index 586ca963dd714f04d029b29808da1941c44f4ac9..38d6414e6120c400df39b0917b843c1f9a1760aa 100644 (file)
@@ -109,6 +109,10 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* Solaris is SVR4-based.  */
   i386_svr4_init_abi (info, gdbarch);
 
+  /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols,
+     and for SunPRO 3.0, N_FUN symbols too.  */
+  set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
   /* Handle SunPRO encoding of static symbols.  */
   set_gdbarch_static_transform_name (gdbarch, i386_sol2_static_transform_name);
 
index 3797287a6829f7f7507becba79f69588964ea4b0..07f984608ff3012946f590f08cb2552c1c1ce2bf 100644 (file)
@@ -2844,21 +2844,20 @@ parse_partial_symbols (struct objfile *objfile)
 
                      prev_textlow_not_set = textlow_not_set;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
                      /* A zero value is probably an indication for the SunPRO 3.0
                         compiler. end_psymtab explicitly tests for zero, so
                         don't relocate it.  */
 
-                     if (sh.value == 0)
+                     if (sh.value == 0
+                         && gdbarch_sofun_address_maybe_missing
+                             (current_gdbarch))
                        {
                          textlow_not_set = 1;
                          valu = 0;
                        }
                      else
                        textlow_not_set = 0;
-#else
-                     textlow_not_set = 0;
-#endif
+
                      past_first_source_file = 1;
 
                      if (prev_so_symnum != symnum - 1)
@@ -3225,19 +3224,19 @@ parse_partial_symbols (struct objfile *objfile)
                    continue;
 
                  case N_ENDM:
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
                    /* Solaris 2 end of module, finish current partial
                       symbol table.  END_PSYMTAB will set
                       pst->texthigh to the proper value, which is
                       necessary if a module compiled without
                       debugging info follows this module.  */
-                   if (pst)
+                   if (pst
+                       && gdbarch_sofun_address_maybe_missing
+                            (current_gdbarch))
                      {
                        pst = (struct partial_symtab *) 0;
                        includes_used = 0;
                        dependencies_used = 0;
                      }
-#endif
                    continue;
 
                  case N_RBRAC:
index 0798426eaf20d744f0c73730d00ac092608ccb66..485079761371d916b66bd97a928fe808f67da9d3 100644 (file)
@@ -165,14 +165,12 @@ lookup_minimal_symbol (const char *name, const char *sfile,
   unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
   unsigned int dem_hash = msymbol_hash_iw (name) % MINIMAL_SYMBOL_HASH_SIZE;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
   if (sfile != NULL)
     {
       char *p = strrchr (sfile, '/');
       if (p != NULL)
        sfile = p + 1;
     }
-#endif
 
   for (objfile = object_files;
        objfile != NULL && found_symbol == NULL;
@@ -209,18 +207,9 @@ lookup_minimal_symbol (const char *name, const char *sfile,
                       case mst_file_text:
                       case mst_file_data:
                       case mst_file_bss:
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
                         if (sfile == NULL
                            || strcmp (msymbol->filename, sfile) == 0)
                           found_file_symbol = msymbol;
-#else
-                        /* We have neither the ability nor the need to
-                           deal with the SFILE parameter.  If we find
-                           more than one symbol, just return the latest
-                           one (the user can't expect useful behavior in
-                           that case).  */
-                        found_file_symbol = msymbol;
-#endif
                         break;
 
                       case mst_solib_trampoline:
index 379272a51d50557a54a9fc0bece18393bc02899f..48c8e4c986dd60f3f9aa5431f9814bd2834d1d55 100644 (file)
@@ -3371,6 +3371,10 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
   set_gdbarch_breakpoint_from_pc (gdbarch, rs6000_breakpoint_from_pc);
 
+  /* The value of symbols of type N_SO and N_FUN maybe null when
+     it shouldn't be. */
+  set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
   /* Handles single stepping of atomic sequences.  */
   set_gdbarch_software_single_step (gdbarch, deal_with_atomic_sequence);
   
index bb04fd5f63ba03ad3ff2fb389bcfff206d96b700..50434f695f7478a8091d76de49498775c429d979 100644 (file)
@@ -206,6 +206,11 @@ sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO)
+     compiler puts out 0 instead of the address in N_SO stabs.  Starting with
+     SunPRO 3.0, the compiler does this for N_FUN stabs too.  */
+  set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
   /* The Sun compilers also do "globalization"; see the comment in
      sparc_sol2_static_transform_name for more information.  */
   set_gdbarch_static_transform_name
index 5411b9bdff6d2cc1cce24b796bd4a350862ed82d..ab9a4610d4a6ac52578a6a5f2fb4f6582e0e4882 100644 (file)
@@ -157,6 +157,11 @@ sparc64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   sparc64_init_abi (info, gdbarch);
 
+  /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO)
+     compiler puts out 0 instead of the address in N_SO stabs.  Starting with
+     SunPRO 3.0, the compiler does this for N_FUN stabs too.  */
+  set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
   /* The Sun compilers also do "globalization"; see the comment in
      sparc_sol2_static_transform_name for more information.  */
   set_gdbarch_static_transform_name
index c49ab1f7e503d1e8abe15674f08635c00f6731b8..f5fe4abc2ef8c4a828393f20eb904a39abbe6163 100644 (file)
@@ -356,10 +356,8 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
        {
          fprintf_filtered (outfile, "  %s", SYMBOL_DEMANGLED_NAME (msymbol));
        }
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
       if (msymbol->filename)
        fprintf_filtered (outfile, "  %s", msymbol->filename);
-#endif
       fputs_filtered ("\n", outfile);
     }
   if (objfile->minimal_symbol_count != index)
index c50f087a751308f253507b7ae1deb020010f7e53..da35b2948485c2022aeecce4d697a71471f1521f 100644 (file)
@@ -345,10 +345,8 @@ struct minimal_symbol
 
   unsigned long size;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
   /* Which source file is this symbol in?  Only relevant for mst_file_*.  */
   char *filename;
-#endif
 
   /* Classification type for this minimal symbol.  */