Commit Graph
87 Commits
Author SHA1 Message Date
bebbo b914ad8df0 @M added devel1 modifications to starting base 2017-03-13 21:19:09 +01:00
Gunther Nikl 374b9faeb4 Factor out common code for processing a.out and hunk relocations.
* bfd/amigaoslink.c (amiga_update_target_section): New function, broken out
  of amiga_perform_reloc.
  (amiga_perform_reloc): Use it.
  (aout_update_target_section): New function, broken out of aout_perform_reloc.
  (aout_perform_reloc): Use it.
2015-07-03 12:02:29 +00:00
Gunther Nikl c49e1d0d04 Minor cleanup.
* bfd/amigaoslink.c (amiga_perform_reloc): Remove UNUSED from abfd argument.
  (aout_perform_reloc): Reformat debug statements for clarity.
2015-07-03 10:01:50 +00:00
Gunther Nikl 5959708977 Rename a helper macro to better reflect what the macro is used for.
* bfd/amigaos.c (bfd_is_bfd_section): Rename from this ...
  (bfd_is_special_section): ... to this.
2015-06-16 17:40:36 +00:00
Gunther Nikl d2bd053001 Simplify logic dealing with RELOC32SHORT data from an executable.
* bfd/amigaos.c (howto_for_raw_reloc): New parameter indicating file type.
  Use it for mapping HUNK_DREL32 to ABS32 or SD32.
  (amiga_handle_rest): Remove special handling of HUNK_DREL32.
  (read_raw_relocs): Likewise.
2015-06-03 18:03:28 +00:00
Gunther Nikl 75ee6e77cc In an object file a HUNK_RELRELOC32 has 32bit data.
* bfd/amigaos.c (parse_archive_units): Read contents of HUNK_RELRELOC32 as
  32bit words.
2015-06-03 17:55:47 +00:00
Gunther Nikl 33dc868cd6 Move check of on-disk size of relocation data into a separate function.
* bfd/amigaos.c (amiga_reloc_long_p): New function checking a hunk type for
  on-disk size of relocation data.
  (amiga_handle_rest): Use new function.
  (amiga_write_section_contents): Likewise.
  (read_raw_relocs): Likewise.
2015-06-03 17:11:42 +00:00
Gunther Nikl eb89bd3709 Minor style correction.
* bfd/amigaos.c (howto_for_raw_reloc): Remove parameter name from prototype.
  (howto_for_reloc): Likewise.
2015-06-03 16:18:00 +00:00
Gunther Nikl 3da84a8d63 Add missing sanity check for pc-relative references from a.out objects.
This check was already present for references from hunk objects.

* bfd/amigaoslink.c (aout_perform_reloc): For pc-relative references only
  references to the same output section are permitted.
2015-05-25 12:39:35 +00:00
Gunther Nikl 4e19233665 Add support for relocation hunks with short (16bit) data.
* bfd/amigaos.c (write_words): Add protototype.
  (write_words): New function to write 16bit words.
  (amiga_write_section_contents): Use write_words to write 16bit relocs.
2015-05-15 19:35:50 +00:00
Gunther Nikl 0c09613c8f Fix RELRELOC32 reading and decoding. AmigaOS 3.x expects short data.
* bfd/amigaos.c (parse_archive_units): Add support for HUNK_RELOC32SHORT.
  Parse HUNK_RELRELOC32 the same way.
  (amiga_handle_rest): Check for HUNK_RELRELOC32 when reading short data.
  (read_raw_relocs): Likewise.
2015-05-15 19:22:06 +00:00
Gunther Nikl 5df18f43a6 Merge normal RELOC32 and RELOC32SHORT howto selection.
* bfd/amigaos.c (R_ABS32SHORT): Remove.
  (howto_table): Remove H_ABS32SHORT entry.
  (howto_for_raw_reloc): Use R_ABS32 entry for HUNK_RELOC32SHORT.
2015-05-15 18:53:34 +00:00
Gunther Nikl 179c404953 Change HOWTO enumeration.
* bfd/libamiga.h (H_PC32SHORT): New enum value.
  (H_PC26): Moved to end of enumeration.
2015-05-15 18:45:53 +00:00
Gunther Nikl 39cb210148 Fix behaviour of a core bfd function generating sections.
For details check https://sourceware.org/ml/binutils/2003-07/msg00077.html
about the patch.

* bfd/section.c (bfd_make_section): Return NULL for existing section.
2015-05-05 19:01:47 +00:00
Gunther Nikl e2b5906c8a Accept additional hunk types containing raw relocation data at two places
missed before.

* bfd/amigaos.c (parse_archive_units): Handle HUNK_RELRELOC32, HUNK_ABSRELOC16
  and HUNK_RELRELOC26.
  (amiga_handle_rest): Likewise.
2015-04-29 19:07:20 +00:00
Gunther Nikl ddc877b3d3 Minor white space changes.
* bfd/amigaos.c (amiga_handle_rest): Use TABs.
  (amiga_write_object_contents): Likewise.
  (read_raw_relocs): Likewise.
2015-04-29 18:52:24 +00:00
Gunther Nikl f723c5d6ef Unify relocation read logic.
* bfd/amigaos.c (read_raw_relocs): Replace switch with an if test.
2015-04-29 18:48:43 +00:00
Gunther Nikl 48a6d2ca95 Handle more relocation hunk types and treat absolute relocations as such
where possible.

* bfd/amigaos.c (reloc_types array): Add HUNK_ABSRELOC16 and HUNK_RELRELOC32.
  (determine_type): Update for layout change of reloc_types array.
2015-04-29 18:36:00 +00:00
Gunther Nikl 6a60985980 Add support for EXT_RELCOMMON.
* bfd/amigaos.c (howto_for_reloc): Handle EXT_RELCOMMON.
  (parse_archive_units): Likewise.
  (amiga_handle_rest): Likewise.
  (amiga_write_symbols): Likewise.
  (amiga_slurp_symbol_table): Likewise.
  (amiga_slurp_relocs): Likewise.
  (amiga_slurp_armap): Likewise.
2015-04-29 18:27:38 +00:00
Gunther Nikl 6bda262494 Group common reloc types.
* bfd/amigaos.c (reloc enum): Move R_PC32 entry.
  (howto_table): Likewise.
2015-04-29 18:21:58 +00:00
Gunther Nikl 52d21eb1f2 Handle absolute 8-bit and 16-bit amigaos relocations.
* bfd/amigaos.c (reloc enum): Add values for 8-bit and 16-bit absolute relocs.
  (howto_table): Add entries for the new enum values.
  (howto_for_raw_reloc): Handle HUNK_ABSRELOC16.
  (howto_for_reloc): Handle EXT_ABSREF9 and EXT_ABSREF16.
  (parse_archive_units): Likewise.
  (amiga_handle_rest): Likewise.
  (amiga_write_symbols): Likewise.
  (amiga_slurp_armap): Likewise.
  (amiga_bfd_reloc_type_lookup): Map normal 8-bit and 16-bit BFD relocs to
  their absolute amigaos variants.
2015-04-29 18:16:46 +00:00
Gunther Nikl fc73468ff9 Prefer BFD data where available.
* bfd/amigaos.c (amiga_write_section_contents): Consult relocation howto
  for the size of the relocation object.
2015-04-29 17:18:00 +00:00
Gunther Nikl 865652483c Handle more hunk types containing raw relocation data.
* bfd/amigaos.c (howto_for_raw_reloc): Handle HUNK_RELRELOC32 and HUNK_RELRELOC26.
2015-04-29 17:08:54 +00:00
Gunther Nikl cc69950864 Make reading HUNK_EXT data robust.
* bfd/amigaos.c (howto_for_reloc): New helper function to select a relocation
  howto entry.
  (amiga_slurp_relocs): Use it.
2015-04-29 17:03:03 +00:00
Gunther Nikl 1bb550cac5 Make reading raw relocation data robust.
* bfd/amigaos.c (howto_for_raw_reloc): New function to select a relocation
  howto entry.
  (read_raw_relocs): Use it.
2015-04-29 16:53:23 +00:00
Gunther Nikl 1dc1e0d965 Add a helper function to read a 16-bit value.
* bfd/amigaos.c (get_word): New helper function.
  (amiga_handle_rest): Use new helper function.
  (read_raw_relocs): Likewise.
2015-04-29 16:39:36 +00:00
Gunther Nikl d726b16546 Stop accessing BFD backend data member with type-punning. This silences
modern GCC versions.

* bfd/bfd-in2.h (struct bfd): Add amiga_ar_data to tdata union.
* bfd/amigaos.c (amiga_ardata): Use amiga_ar_data union member.
2015-03-29 13:01:31 +00:00
Gunther Nikl 9658695df9 Tolerate bfd_link_hash_warning for input BFD symbols.
* bfd/linker.c (_bfd_generic_link_output_symbols): Accept bfd_link_hash_warning.
2015-03-29 12:38:57 +00:00
Gunther Nikl 449a4bb122 Completely backport _bfd_ar_spacepad() changes from
X-Git-Url: http://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=390c0e4288ca46982c7702ec420d277c021032f4

* bfd/libbfd-in.h (_bfd_ar_spacepad): New prototype.
* bfd/libbfd.h (_bfd_ar_spacepad): Likewise.
* bfd/archive.c (_bfd_ar_spacepad): Use K&R style as rest of file.
* bfd/archive64.c (bfd_elf64_archive_write_armap): Use _bfd_ar_spacepad.
2015-03-29 12:32:37 +00:00
Jens Maus b8fa24d6f7 - backported function _bfd_ar_spacepad() from newer binutils versions in archive.c which fixes buffer overflow problems in these older versions of binutils. 2015-03-26 08:13:01 +00:00
Gunther Nikl f4a1fde5e7 * (amiga_write_object_contents): Use amiga_symbol macro.
* (amiga_slurp_relocs): Likewise.
2014-11-27 21:05:24 +00:00
Gunther Nikl 11b5fe1b1d * (amiga_write_object_contents): Fix HUNK_DEBUG size calculation for 64bit hosts.
The broken code used the wrong structure for the size calculation. This bug was
  hidden on 32bit hosts since both structures have the same size on such hosts.
  The AmigaOS program loader refuses to load programs with a defective structure.
2014-11-27 21:01:50 +00:00
Gunther Nikl c1f1f943e1 Backport fixes for PR gas/3041 (bfd assembler):
[gas]
2010-09-09  Gunther Nikl  <gnikl@users.sourceforge.net>

	* gas/config/tc-m68k.c (tc_gen_reloc): Handle references to defined
	weak symbols first if generating an a.out object.

2009-10-013  Vincent Riviere  <vincent.riviere@freesbee.fr>

	PR gas/3041
	* config/tc-m68k.c (tc_gen_reloc): Fix addend for relocations
	located in data section an referencing a weak symbol.

2007-05-15  Vincent Riviere  <vincent.riviere@freesbee.fr>

	PR gas/3041
	* config/tc-m68k.c (relaxable_symbol): Make sure that the correct
	addend is stored for relocs against weak symbols.
	(md_apply_fix): So not loose track of addend for relocs against
	weak symbols.

2007-05-03  Vincent Riviere  <vincent.riviere@freesbee.fr>
	    Nick Clifton  <nickc@redhat.com>

	PR gas/3041
	* config/tc-m68k.c (relaxable_symbol): Do not relax weak symbols.
	(tc_gen_reloc): Adjust the addend of relocs against weak symbols.
	(md_apply_fix): Put zero values into the frags referencing weak
	symbols.

[bfd]
2007-05-03  Vincent Riviere  <vincent.riviere@freesbee.fr>
	    Nick Clifton  <nickc@redhat.com>

	PR gas/3041
	* aoutx.h (swap_std_reloc_out): Treat relocs against weak symbols
	in the same way as relocs against external symbols.


Weak fixes for the non-bfd assembler:

* gas/config/tc-m68k.h (S_IS_WEAK): Define for !BFD_ASSEMBLER.
* gas/config/tc-m68k.c (tc_aout_fix_to_chars): Check weak symbol state.
* gas/write.c (fixup_segment): Treat a weak symbol as undefined.
2014-11-17 20:24:28 +00:00
Gunther Nikl 29a0d609c6 (parse_archive_units): Ignore memory type bits when examining hunk type.
(amiga_read_unit): Directly read hunk type into hunk_type variable.
(amiga_read_load): Likewise.
(amiga_handle_cdb_hunk): Ignore memory type bits when examining hunk type.
(amiga_handle_rest): Likewise.
2014-11-16 18:19:02 +00:00
Gunther Nikl 3710c56d3b (amiga_read_ar_hdr): Increase the allocated file name buffer in case the
found hunk name has to be modified.
Add an "unique" file name extension if the read hunk name does not have
an .o or .obj extension.
2014-11-16 17:21:24 +00:00
Gunther Nikl 3d7cf01998 (amiga_perform_reloc): Catch baserelative relocations against code symbols.
(aout_perform_reloc): Likewise.
2009-03-07 19:28:21 +00:00
Gunther Nikl f089ef8a68 (MAX_NAME_SIZE): Set to 124.
(write_name): Limit name to MAX_NAME_SIZE when writing a loadfile.
2009-03-07 19:27:05 +00:00
Gunther Nikl 94d81690b0 Symbols on m68k-amigaos have underscores. 2009-01-14 16:57:05 +00:00
Gunther Nikl e431b46fb2 (amiga_write_section_contents): Use datatype of "reloc_counts" also for
"reloc_count". Better error message for a relocation against an omitted
section. Replace BFD_FAIL with "bfd_set_error/return FALSE" since linking
cannot succeed. Prevent a possible endless loop when writing relocations.
Fail link operation if not all relocations could be written.
2009-01-08 13:10:10 +00:00
Gunther Nikl b0b16e9038 * amigaos.c (parse_archive_units): Strip final \n from bfd_msg format string.
(amiga_read_load): Likewise.
(amiga_handle_rest): Likewise.
(amiga_write_object_contents): Likewise.
(amiga_write_section_contents): Likewise.
(amiga_write_symbols): Likewise.
(amiga_slurp_armap): Likewise.
* amigaoslink.c (amiga_perform_reloc): Likewise.
(aout_perform_reloc): Likewise.
(amiga_final_link): Likewise.
2009-01-05 12:48:24 +00:00
Gunther Nikl f7a41d0cc6 (MY_bfd_link_add_symbols): Don't define in terms of MY. 2008-12-24 10:22:55 +00:00
Gunther Nikl 5391bb7612 (howto_table[H_PC26]): Lower two bits in mask values are not set. 2008-12-23 16:58:37 +00:00
Gunther Nikl f571c97eaa (determine_size): Remove macro.
(amiga_write_section_contents): Directly use reloc type as switch value.
2008-12-23 16:54:30 +00:00
Gunther Nikl 046f38d206 (amiga_handle_cdb_hunk): Only use non-empty HUNK_NAME content. 2008-12-23 16:53:36 +00:00
Gunther Nikl a4ccb0ea31 (amiga_handle_rest): Factor out common code. Rearrange switch. 2008-12-23 16:52:27 +00:00
Gunther Nikl c769148c66 (generic_link_check_archive_element): Use flavour from info->hash->creator
to really catch an amiga link when computing maximal symbol alignment.
(_bfd_generic_link_add_one_symbol): Likewise. Add the same kludge to case
'BIG' as used for case 'COM'.
2008-12-23 16:51:39 +00:00
Gunther Nikl cfc38a6ae0 * bfd/libamiga.h (comments): Improve comments.
* bfd/linker.c (generic_link_check_archive_element): Likewise.
(_bfd_generic_link_add_one_symbol): Likewise.
2008-12-23 16:50:39 +00:00
Gunther Nikl cd50ea2f0a (MY_bfd_link_add_symbols): Define to override generic a.out function.
(link_add_symbols): New wrapper function to handle symbols the same way
as the amiga backend by using a generic linker function when doing a
final link. This makes --wrap option of ld work.
2008-12-23 16:48:47 +00:00
Gunther Nikl 31f7d6e4ba * bfd/aoutx.h (swap_std_reloc_out): Use bfd_asymbol_flavour.
* ld/emultempl/amiga.em (amiga_assign_attribute): Use bfd_get_flavour.
* ld/ldctor.c (ldctor_build_sets): Likewise.
2008-12-23 16:23:14 +00:00
Gunther Nikl 895c223cb3 (my_add_to): Replace boolean argument with a flags mask. Read addends as
requested in that mask either signed or unsigned.
(amiga_perform_reloc): Test final relocation always signed. Request reading
the addend of baserel relocations as unsigned value. Note that this is not
always correct but should only be done for symbols that came from the same
unit as the relocation.
(aout_perform_reloc): Likewise.
2008-12-23 16:09:09 +00:00