Merge remote-tracking branch 'origin/master' into amd-common

[deliverable/binutils-gdb.git] / include / elf / i960.h

diff --git a/include/elf/i960.h b/include/elf/i960.h
index 7939d289942954c2560a2b80270adec2af60ee9a..ae610abb9705c0aeea1047e15e6908d01298c028 100644 (file)
--- a/include/elf/i960.h
+++ b/include/elf/i960.h
@@ -1,11 +1,11 @@
 /* Intel 960 ELF support for BFD.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    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,
@@ -15,12 +15,13 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_I960_H
 #define _ELF_I960_H
 
-#include "reloc-macros.h"
+#include "elf/reloc-macros.h"
+
 
 START_RELOC_NUMBERS (elf_i960_reloc_type)
      RELOC_NUMBER (R_960_NONE,     0)
@@ -31,7 +32,6 @@ START_RELOC_NUMBERS (elf_i960_reloc_type)
      RELOC_NUMBER (R_960_OPTCALL,   5)
      RELOC_NUMBER (R_960_OPTCALLX,  6)
      RELOC_NUMBER (R_960_OPTCALLXA, 7)
-     EMPTY_RELOC (R_960_max)
-END_RELOC_NUMBERS
+END_RELOC_NUMBERS (R_960_max)
 
 #endif /* _ELF_I960_H */