diff options
| author | Fred Fish <fnf@specifix.com> | 1997-05-26 18:00:54 +0000 |
|---|---|---|
| committer | Fred Fish <fnf@specifix.com> | 1997-05-26 18:00:54 +0000 |
| commit | 315dc1f411fafd4059e400150121636f6dbf96d1 (patch) | |
| tree | 3d3eac3a343e59777e413efcb1693ac708af86a9 /bfd | |
| parent | 1079e76c45b0393736ae8ec1a9c8224bfe8e44d4 (diff) | |
| download | gdb-315dc1f411fafd4059e400150121636f6dbf96d1.zip gdb-315dc1f411fafd4059e400150121636f6dbf96d1.tar.gz gdb-315dc1f411fafd4059e400150121636f6dbf96d1.tar.bz2 | |
* peicode.h (coff_bfd_print_private_bfd_data): #undef before #define.
(coff_bfd_copy_private_bfd_data): Ditto.
* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Make static.
(coff_arm_bfd_print_private_bfd_data): Ditto.
(coff_arm_bfd_set_private_flags): Ditto.
(coff_arm_bfd_copy_private_bfd_data): Ditto.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/coff-arm.c | 21 |
2 files changed, 22 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3cdf64f..401ed06 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +Mon May 26 10:57:48 1997 Fred Fish <fnf@cygnus.com> + + * peicode.h (coff_bfd_print_private_bfd_data): #undef before #define. + (coff_bfd_copy_private_bfd_data): Ditto. + * coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Make static. + (coff_arm_bfd_print_private_bfd_data): Ditto. + (coff_arm_bfd_set_private_flags): Ditto. + (coff_arm_bfd_copy_private_bfd_data): Ditto. + Fri May 23 15:14:58 1997 Fred Fish <fnf@cygnus.com> * libcoff-in.h (struct coff_final_link_info): Add boolean diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index 1f0e348..80200d6 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -488,12 +488,12 @@ coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp) attempting to merge binaries compiled for different ARM targets, eg different CPUs or differents APCS's. */ -boolean +static boolean coff_arm_bfd_merge_private_bfd_data (ibfd, obfd) bfd * ibfd; bfd * obfd; { - BFD_ASSERT (ibfd != NULL && obfd != NULL) + BFD_ASSERT (ibfd != NULL && obfd != NULL); if (ibfd == obfd) return true; @@ -521,7 +521,12 @@ coff_arm_bfd_merge_private_bfd_data (ibfd, obfd) } } else - SET_APCS_FLAG (obfd, APCS_FLAG (ibfd)); + { + SET_APCS_FLAG (obfd, APCS_FLAG (ibfd)); + + /* Set up the arch and fields as well as these are probably wrong */ + bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd)); + } } return true; @@ -530,7 +535,7 @@ coff_arm_bfd_merge_private_bfd_data (ibfd, obfd) /* Display the flags field */ -boolean +static boolean coff_arm_bfd_print_private_bfd_data (abfd, ptr) bfd * abfd; PTR ptr; @@ -555,13 +560,13 @@ coff_arm_bfd_print_private_bfd_data (abfd, ptr) the COFF filehdr structure, which contains important, target specific information. */ -boolean +static boolean coff_arm_bfd_set_private_flags (abfd, flags) bfd * abfd; flagword flags; { int flag; - + BFD_ASSERT (abfd != NULL); flag = (flags & F_APCS26) ? F_APCS_26 : 0; @@ -579,12 +584,12 @@ coff_arm_bfd_set_private_flags (abfd, flags) /* Copy the important parts of the target specific data from one instance of a BFD to another. */ -boolean +static boolean coff_arm_bfd_copy_private_bfd_data (src, dest) bfd * src; bfd * dest; { - BFD_ASSERT (src != NULL && dest != NULL) + BFD_ASSERT (src != NULL && dest != NULL); if (src == dest) return true; |