Merge commit 'upstream/2.20'

[msp430-binutils.git] / bfd / coff-i960.c

diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
index 7233c43dce67b95ccc01e583f55a1d10ba2f12ad..d0374d2789a0d12b34bc5f3a6092ebb5428ddcc0 100644 (file)
--- a/bfd/coff-i960.c
+++ b/bfd/coff-i960.c
@@ -1,6 +1,6 @@
 /* BFD back-end for Intel 960 COFF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,
 /* BFD back-end for Intel 960 COFF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,

-   2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2007, 2008  Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -28,7 +28,12 @@
 #include "libbfd.h"
 #include "coff/i960.h"
 #include "coff/internal.h"
 #include "libbfd.h"
 #include "coff/i960.h"
 #include "coff/internal.h"

-#include "libcoff.h"           /* to allow easier abstraction-breaking */
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata     NULL
+#endif
+
+#include "libcoff.h"           /* To allow easier abstraction-breaking.  */

 
 static bfd_boolean coff_i960_is_local_label_name
   PARAMS ((bfd *, const char *));
 
 static bfd_boolean coff_i960_is_local_label_name
   PARAMS ((bfd *, const char *));


@@ -483,14 +488,14 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (howto->type == R_OPTCALL && ! info->relocatable && symndx != -1)
        {
 
       if (howto->type == R_OPTCALL && ! info->relocatable && symndx != -1)
        {

-         int class;
+         int class_val;

 
          if (h != NULL)
 
          if (h != NULL)

-           class = h->class;
+           class_val = h->symbol_class;

          else
          else

-           class = sym->n_sclass;
+           class_val = sym->n_sclass;

 
 

-         switch (class)
+         switch (class_val)

            {
            case C_NULL:
              /* This symbol is apparently not from a COFF input file.
            {
            case C_NULL:
              /* This symbol is apparently not from a COFF input file.