projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: Enable testing infrastructure
[external/binutils.git]
/
bfd
/
aout-cris.c
diff --git
a/bfd/aout-cris.c
b/bfd/aout-cris.c
index
c6af912
..
feed5ed
100644
(file)
--- a/
bfd/aout-cris.c
+++ b/
bfd/aout-cris.c
@@
-1,5
+1,5
@@
/* BFD backend for CRIS a.out binaries.
/* BFD backend for CRIS a.out binaries.
- Copyright
2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
+ Copyright
(C) 2000-2019
Free Software Foundation, Inc.
Contributed by Axis Communications AB.
Written by Hans-Peter Nilsson.
Contributed by Axis Communications AB.
Written by Hans-Peter Nilsson.
@@
-7,7
+7,7
@@
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 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,
@@
-17,13
+17,14
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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 02110-1301, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
/* See info in the file PORTING for documentation of these macros and
functions. Beware; some of the information there is outdated. */
#define N_HEADER_IN_TEXT(x) 0
/* See info in the file PORTING for documentation of these macros and
functions. Beware; some of the information there is outdated. */
#define N_HEADER_IN_TEXT(x) 0
-#define N_TXTOFF(x)
32
+#define N_TXTOFF(x) 32
#define ENTRY_CAN_BE_ZERO
#define TEXT_START_ADDR 0
#define ENTRY_CAN_BE_ZERO
#define TEXT_START_ADDR 0
@@
-36,7
+37,7
@@
after text, but with those, we don't have any choice besides reading
symbol info, and luckily there's no pressing need for correctness for
those vma:s at this time. */
after text, but with those, we don't have any choice besides reading
symbol info, and luckily there's no pressing need for correctness for
those vma:s at this time. */
-#define N_TXTADDR(x) ((x)
.
a_entry & ~(bfd_vma) 0xffff)
+#define N_TXTADDR(x) ((x)
->
a_entry & ~(bfd_vma) 0xffff)
/* If you change this to 4, you can not link to an address N*4+2. */
#define SEGMENT_SIZE 2
/* If you change this to 4, you can not link to an address N*4+2. */
#define SEGMENT_SIZE 2
@@
-55,11
+56,6
@@
#define TARGET_PAGE_SIZE SEGMENT_SIZE
#define TARGETNAME "a.out-cris"
#define TARGET_PAGE_SIZE SEGMENT_SIZE
#define TARGETNAME "a.out-cris"
-/* N_SHARED_LIB gets this reasonable default as of 1999-07-12, but we
- have to work with 2.9.1. Note that N_SHARED_LIB is used in a
- SUN-specific context, not applicable to CRIS. */
-#define N_SHARED_LIB(x) 0
-
/* The definition here seems not used; just provided as a convention. */
#define DEFAULT_ARCH bfd_arch_cris
/* The definition here seems not used; just provided as a convention. */
#define DEFAULT_ARCH bfd_arch_cris
@@
-69,6
+65,7
@@
#define MY(OP) CONCAT2 (cris_aout_,OP)
#define NAME(x, y) CONCAT3 (cris_aout,_32_,y)
#define MY(OP) CONCAT2 (cris_aout_,OP)
#define NAME(x, y) CONCAT3 (cris_aout,_32_,y)
+#include "sysdep.h"
#include "bfd.h"
/* Version 1 of the header. */
#include "bfd.h"
/* Version 1 of the header. */
@@
-96,8
+93,8
@@
static bfd_boolean MY (set_sizes) (bfd *);
not call set_sizes. */
#define MY_set_arch_mach NAME (aout, set_arch_mach)
not call set_sizes. */
#define MY_set_arch_mach NAME (aout, set_arch_mach)
-#define SET_ARCH_MACH(BFD, EXEC) \
- MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXEC))
+#define SET_ARCH_MACH(BFD, EXEC
P
) \
+ MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXEC
P
))
/* These macros describe the binary layout of the reloc information we
use in a file. */
/* These macros describe the binary layout of the reloc information we
use in a file. */
@@
-132,9
+129,9
@@
MY (write_object_contents) (bfd *abfd)
/* Setting N_SET_MACHTYPE and using N_SET_FLAGS is not performed by
the default definition. */
if (bfd_get_arch (abfd) == bfd_arch_cris)
/* Setting N_SET_MACHTYPE and using N_SET_FLAGS is not performed by
the default definition. */
if (bfd_get_arch (abfd) == bfd_arch_cris)
- N_SET_MACHTYPE (
*
execp, M_CRIS);
+ N_SET_MACHTYPE (execp, M_CRIS);
- N_SET_FLAGS (
*
execp, aout_backend_info (abfd)->exec_hdr_flags);
+ N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags);
WRITE_HEADERS (abfd, execp);
WRITE_HEADERS (abfd, execp);
@@
-199,8
+196,9
@@
MY (swap_ext_reloc_out) (bfd *abfd,
We may change this later, but assert this for the moment. */
if (r_type > 2)
{
We may change this later, but assert this for the moment. */
if (r_type > 2)
{
- (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"),
- bfd_get_filename (abfd), r_type);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%pB: unsupported relocation type exported: %#x"),
+ abfd, r_type);
bfd_set_error (bfd_error_wrong_format);
}
bfd_set_error (bfd_error_wrong_format);
}
@@
-242,8
+240,9
@@
MY (swap_ext_reloc_in) (bfd *abfd,
if (r_type > 2)
{
if (r_type > 2)
{
- (*_bfd_error_handler) (_("%B: Invalid relocation type imported: %d"),
- abfd, r_type);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%pB: unsupported relocation type imported: %#x"),
+ abfd, r_type);
bfd_set_error (bfd_error_wrong_format);
}
bfd_set_error (bfd_error_wrong_format);
}
@@
-252,8
+251,9
@@
MY (swap_ext_reloc_in) (bfd *abfd,
if (r_extern && r_index > symcount)
{
if (r_extern && r_index > symcount)
{
- (*_bfd_error_handler)
- (_("%B: Bad relocation record imported: %d"), abfd, r_index);
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB: bad relocation record imported: %d"), abfd, r_index);
bfd_set_error (bfd_error_wrong_format);
bfd_set_error (bfd_error_wrong_format);