Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / sol2-tdep.h

diff --git a/gdb/sol2-tdep.h b/gdb/sol2-tdep.h
index 304c8b615974ea236d1add7e9f7071213c962c58..b3f01a02f0848b9407d55fbcbdf45c7b31bc4a59 100644 (file)
--- a/gdb/sol2-tdep.h
+++ b/gdb/sol2-tdep.h
@@ -1,12 +1,12 @@
 /* Target-dependent code for Solaris.
 
 /* Target-dependent code for Solaris.
 

-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2020 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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef SOL2_TDEP_H
 #define SOL2_TDEP_H 1
 
 #ifndef SOL2_TDEP_H
 #define SOL2_TDEP_H 1


@@ -26,4 +24,6 @@ struct gdbarch;
 
 CORE_ADDR sol2_skip_solib_resolver (struct gdbarch *, CORE_ADDR);
 
 
 CORE_ADDR sol2_skip_solib_resolver (struct gdbarch *, CORE_ADDR);
 

+std::string sol2_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid);
+

 #endif /* sol2-tdep.h */
 #endif /* sol2-tdep.h */