Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / opcodes / sysdep.h

diff --git a/opcodes/sysdep.h b/opcodes/sysdep.h
index 4f1efb23339732af5a63da16a355dc0dd32192c7..7ddf55de62850385a83d489dae4790e6a187414b 100644 (file)
--- a/opcodes/sysdep.h
+++ b/opcodes/sysdep.h
@@ -1,24 +1,25 @@
 /* Random host-dependent support code.
-   Copyright 1995, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.
    Written by Ken Raeburn.
 
-   This file is part of libopcodes, the opcodes library.
+   This file is part of the GNU opcodes library.
 
-   This program is free software; you can redistribute it and/or modify
+   This library 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
-   (at your option) any later version.
+   the Free Software Foundation; either version 3, 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.
+   It 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, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+
 /* Do system-dependent stuff, mainly driven by autoconf-detected info.
 
    Well, some generic common stuff is done here too, like including
@@ -26,6 +27,10 @@
    trying to replace often did that.  If it can be dropped from this
    file (check in a non-ANSI environment!), it should be.  */
 
+#ifdef PACKAGE
+#error sysdep.h must be included in lieu of config.h
+#endif
+
 #include "config.h"
 
 #include "ansidecl.h"
@@ -34,6 +39,10 @@
 #include <stdlib.h>
 #endif
 
+#ifdef STRING_WITH_STRINGS
+#include <string.h>
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
@@ -41,3 +50,24 @@
 #include <strings.h>
 #endif
 #endif
+#endif
+
+#if !HAVE_DECL_STPCPY
+extern char *stpcpy (char *__dest, const char *__src);
+#endif
+
+#define opcodes_error_handler _bfd_error_handler
+
+/* Use sigsetjmp/siglongjmp without saving the signal mask if possible.
+   It is faster than setjmp/longjmp on systems where the signal mask is
+   saved.  */
+
+#if defined(HAVE_SIGSETJMP)
+#define OPCODES_SIGJMP_BUF             sigjmp_buf
+#define OPCODES_SIGSETJMP(buf)         sigsetjmp((buf), 0)
+#define OPCODES_SIGLONGJMP(buf,val)    siglongjmp((buf), (val))
+#else
+#define OPCODES_SIGJMP_BUF             jmp_buf
+#define OPCODES_SIGSETJMP(buf)         setjmp(buf)
+#define OPCODES_SIGLONGJMP(buf,val)    longjmp((buf), (val))
+#endif