projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build breakage from last commit (window-nat.c:windows_create_inferior)
[deliverable/binutils-gdb.git]
/
bfd
/
aoutf1.h
diff --git
a/bfd/aoutf1.h
b/bfd/aoutf1.h
index 8e41b61d93eccf2d825c29bc257e6580e7cce67e..e693b03a417bf59ee1ca5f9a6209b4e9423b934b 100644
(file)
--- a/
bfd/aoutf1.h
+++ b/
bfd/aoutf1.h
@@
-1,14
+1,12
@@
/* A.out "format 1" file handling code for BFD.
/* A.out "format 1" file handling code for BFD.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1990-2017 Free Software Foundation, Inc.
Written by Cygnus Support.
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
Written by Cygnus Support.
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,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-18,10
+16,11
@@
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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
-#include "bfd.h"
#include "sysdep.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "aout/sun4.h"
#include "libbfd.h"
#include "aout/sun4.h"
@@
-76,8
+75,9
@@
#define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
static bfd_boolean
#define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
static bfd_boolean
-sunos_merge_private_bfd_data (bfd *ibfd,
bfd *obfd
)
+sunos_merge_private_bfd_data (bfd *ibfd,
struct bfd_link_info *info
)
{
{
+ bfd *obfd = info->output_bfd;
if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
|| bfd_get_flavour (obfd) != bfd_target_aout_flavour)
return TRUE;
if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
|| bfd_get_flavour (obfd) != bfd_target_aout_flavour)
return TRUE;
@@
-156,8
+156,8
@@
sunos_set_arch_mach (bfd *abfd, enum machine_type machtype)
bfd_set_arch_mach (abfd, arch, machine);
}
bfd_set_arch_mach (abfd, arch, machine);
}
-#define SET_ARCH_MACH(ABFD, EXEC) \
- NAME(sunos,set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
+#define SET_ARCH_MACH(ABFD, EXEC
P
) \
+ NAME(sunos,set_arch_mach) (ABFD, N_MACHTYPE (EXEC
P
)); \
choose_reloc_size(ABFD);
/* Determine the size of a relocation entry, based on the architecture. */
choose_reloc_size(ABFD);
/* Determine the size of a relocation entry, based on the architecture. */
@@
-195,14
+195,14
@@
sunos_write_object_contents (bfd *abfd)
switch (bfd_get_mach (abfd))
{
case bfd_mach_m68000:
switch (bfd_get_mach (abfd))
{
case bfd_mach_m68000:
- N_SET_MACHTYPE (
*
execp, M_UNKNOWN);
+ N_SET_MACHTYPE (execp, M_UNKNOWN);
break;
case bfd_mach_m68010:
break;
case bfd_mach_m68010:
- N_SET_MACHTYPE (
*
execp, M_68010);
+ N_SET_MACHTYPE (execp, M_68010);
break;
default:
case bfd_mach_m68020:
break;
default:
case bfd_mach_m68020:
- N_SET_MACHTYPE (
*
execp, M_68020);
+ N_SET_MACHTYPE (execp, M_68020);
break;
}
break;
break;
}
break;
@@
-210,28
+210,28
@@
sunos_write_object_contents (bfd *abfd)
switch (bfd_get_mach (abfd))
{
case bfd_mach_sparc_sparclet:
switch (bfd_get_mach (abfd))
{
case bfd_mach_sparc_sparclet:
- N_SET_MACHTYPE (
*
execp, M_SPARCLET);
+ N_SET_MACHTYPE (execp, M_SPARCLET);
break;
case bfd_mach_sparc_sparclite_le:
break;
case bfd_mach_sparc_sparclite_le:
- N_SET_MACHTYPE (
*
execp, M_SPARCLITE_LE);
+ N_SET_MACHTYPE (execp, M_SPARCLITE_LE);
break;
default:
break;
default:
- N_SET_MACHTYPE (
*
execp, M_SPARC);
+ N_SET_MACHTYPE (execp, M_SPARC);
break;
}
break;
case bfd_arch_i386:
break;
}
break;
case bfd_arch_i386:
- N_SET_MACHTYPE (
*
execp, M_386);
+ N_SET_MACHTYPE (execp, M_386);
break;
default:
break;
default:
- N_SET_MACHTYPE (
*
execp, M_UNKNOWN);
+ N_SET_MACHTYPE (execp, M_UNKNOWN);
}
choose_reloc_size (abfd);
}
choose_reloc_size (abfd);
- N_SET_FLAGS (
*
execp, aout_backend_info (abfd)->exec_hdr_flags);
+ N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags);
- N_SET_DYNAMIC (
*
execp, (long)(bfd_get_file_flags (abfd) & DYNAMIC));
+ N_SET_DYNAMIC (execp, (long)(bfd_get_file_flags (abfd) & DYNAMIC));
WRITE_HEADERS (abfd, execp);
WRITE_HEADERS (abfd, execp);
@@
-398,7
+398,7
@@
swapcore_sun3 (bfd *abfd, char *ext, struct internal_sunos_core *intcore)
intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
- intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
+ intcore->c_data_addr = N_DATADDR (
&
intcore->c_aouthdr);
intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
intcore->fp_stuff_pos = offsetof (struct external_sun3_core, fp_stuff);
intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
intcore->fp_stuff_pos = offsetof (struct external_sun3_core, fp_stuff);
@@
-433,7
+433,7
@@
swapcore_sparc (bfd *abfd, char *ext, struct internal_sunos_core *intcore)
intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
- intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
+ intcore->c_data_addr = N_DATADDR (
&
intcore->c_aouthdr);
intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
intcore->fp_stuff_pos = offsetof (struct external_sparc_core, fp_stuff);
intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
intcore->fp_stuff_pos = offsetof (struct external_sparc_core, fp_stuff);
This page took
0.025081 seconds
and
4
git commands to generate.