diff options
author | DJ Delorie <dj@redhat.com> | 2014-05-27 17:14:49 -0400 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2014-05-27 17:14:49 -0400 |
commit | 7a2f2d82fd0e757dfd6eb79637cb790959f52295 (patch) | |
tree | f83505a11ac59b3a0b866919d285d7c902647929 /ld | |
parent | c23dd3426c75fbf7fa9f30a4082be034818967c1 (diff) | |
download | gdb-7a2f2d82fd0e757dfd6eb79637cb790959f52295.zip gdb-7a2f2d82fd0e757dfd6eb79637cb790959f52295.tar.gz gdb-7a2f2d82fd0e757dfd6eb79637cb790959f52295.tar.bz2 |
Add new link-map-text hook and RX auto-vector support.
* bfd/elf32-rx.c (get_symbol_value_maybe): New.
(rx_elf_relocate_section): If we find a reloc against
$tableentry$default$<name>, redirect it to the appropriate
$tableentry$<n>$.
(RX_Table_Info): New.
(rx_table_find): New. Check all tables and SEC_KEEP all sections
with table parts in them.
(rx_check_directives): New.
(rx_table_map_2): New.
(rx_table_map): New.
(rx_additional_link_map_text): New. Called to dump tables to the
map file.
* bfd/elf32-rx.h: New.
* ld/ldemul.h (extra_map_file_text): New field.
(ldemul_extra_map_file_text): Declare.
* ld/ldemul.c (ldemul_extra_map_file_text): Define.
* ld/ldlang.c (lang_map): Call it.
* ld/emultempl/rxelf.em: Add extra_map_file_text hook.
* ld/emultempl/aix.em: Add NULL extra_map_file_text hook.
* ld/emultempl/armcoff.em: Likewise.
* ld/emultempl/beos.em: Likewise.
* ld/emultempl/elf32.em: Likewise.
* ld/emultempl/generic.em: Likewise.
* ld/emultempl/gld960.em: Likewise.
* ld/emultempl/gld960c.em: Likewise.
* ld/emultempl/linux.em: Likewise.
* ld/emultempl/lnk960.em: Likewise.
* ld/emultempl/m68kcoff.em: Likewise.
* ld/emultempl/pe.em: Likewise.
* ld/emultempl/pep.em: Likewise.
* ld/emultempl/sunos.em: Likewise.
* ld/emultempl/ticoff.em: Likewise.
* ld/emultempl/vanilla.em: Likewise.
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ChangeLog | 24 | ||||
-rw-r--r-- | ld/emultempl/aix.em | 3 | ||||
-rw-r--r-- | ld/emultempl/armcoff.em | 3 | ||||
-rw-r--r-- | ld/emultempl/beos.em | 3 | ||||
-rw-r--r-- | ld/emultempl/elf32.em | 3 | ||||
-rw-r--r-- | ld/emultempl/generic.em | 1 | ||||
-rw-r--r-- | ld/emultempl/gld960.em | 3 | ||||
-rw-r--r-- | ld/emultempl/gld960c.em | 3 | ||||
-rw-r--r-- | ld/emultempl/linux.em | 3 | ||||
-rw-r--r-- | ld/emultempl/lnk960.em | 3 | ||||
-rw-r--r-- | ld/emultempl/m68kcoff.em | 3 | ||||
-rw-r--r-- | ld/emultempl/pe.em | 3 | ||||
-rw-r--r-- | ld/emultempl/pep.em | 3 | ||||
-rw-r--r-- | ld/emultempl/rxelf.em | 4 | ||||
-rw-r--r-- | ld/emultempl/sunos.em | 3 | ||||
-rw-r--r-- | ld/emultempl/ticoff.em | 3 | ||||
-rw-r--r-- | ld/emultempl/vanilla.em | 3 | ||||
-rw-r--r-- | ld/ldemul.c | 7 | ||||
-rw-r--r-- | ld/ldemul.h | 7 | ||||
-rw-r--r-- | ld/ldlang.c | 2 |
20 files changed, 73 insertions, 14 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4e1ab6c..a980c9a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,27 @@ +2014-05-27 DJ Delorie <dj@redhat.com> + + * ld/ldemul.h (extra_map_file_text): New field. + (ldemul_extra_map_file_text): Declare. + * ld/ldemul.c (ldemul_extra_map_file_text): Define. + * ld/ldlang.c (lang_map): Call it. + + * ld/emultempl/rxelf.em: Add extra_map_file_text hook. + * ld/emultempl/aix.em: Add NULL extra_map_file_text hook. + * ld/emultempl/armcoff.em: Likewise. + * ld/emultempl/beos.em: Likewise. + * ld/emultempl/elf32.em: Likewise. + * ld/emultempl/generic.em: Likewise. + * ld/emultempl/gld960.em: Likewise. + * ld/emultempl/gld960c.em: Likewise. + * ld/emultempl/linux.em: Likewise. + * ld/emultempl/lnk960.em: Likewise. + * ld/emultempl/m68kcoff.em: Likewise. + * ld/emultempl/pe.em: Likewise. + * ld/emultempl/pep.em: Likewise. + * ld/emultempl/sunos.em: Likewise. + * ld/emultempl/ticoff.em: Likewise. + * ld/emultempl/vanilla.em: Likewise. + 2014-05-24 Alan Modra <amodra@gmail.com> * ldlang.c (base): Move variable to.. diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em index caa74a9..56985cf 100644 --- a/ld/emultempl/aix.em +++ b/ld/emultempl/aix.em @@ -1553,6 +1553,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = { NULL, /* list_options */ NULL, /* recognized_file */ NULL, /* find potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em index 8e9befc..de10a6c 100644 --- a/ld/emultempl/armcoff.em +++ b/ld/emultempl/armcoff.em @@ -279,6 +279,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_list_options, NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em index 2196510..732abfd 100644 --- a/ld/emultempl/beos.em +++ b/ld/emultempl/beos.em @@ -777,6 +777,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 31761ca..3ebf3b5 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2498,6 +2498,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = ${LDEMUL_LIST_OPTIONS-gld${EMULATION_NAME}_list_options}, ${LDEMUL_RECOGNIZED_FILE-gld${EMULATION_NAME}_load_symbols}, ${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL}, - ${LDEMUL_NEW_VERS_PATTERN-NULL} + ${LDEMUL_NEW_VERS_PATTERN-NULL}, + ${LDEMUL_EXTRA_MAP_FILE_TEXT-NULL} }; EOF diff --git a/ld/emultempl/generic.em b/ld/emultempl/generic.em index b22e2a6..aac4b93 100644 --- a/ld/emultempl/generic.em +++ b/ld/emultempl/generic.em @@ -156,5 +156,6 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = ${LDEMUL_RECOGNIZED_FILE-NULL}, ${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL}, ${LDEMUL_NEW_VERS_PATTERN-NULL} + ${LDEMUL_EXTRA_MAP_FILE_TEXT-NULL} }; EOF diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em index 0df99e3..5632f31 100644 --- a/ld/emultempl/gld960.em +++ b/ld/emultempl/gld960.em @@ -148,6 +148,7 @@ struct ld_emulation_xfer_struct ld_gld960_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em index 805e69b..dd69c79 100644 --- a/ld/emultempl/gld960c.em +++ b/ld/emultempl/gld960c.em @@ -161,6 +161,7 @@ struct ld_emulation_xfer_struct ld_gld960coff_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/linux.em b/ld/emultempl/linux.em index b30e872..bbc5946 100644 --- a/ld/emultempl/linux.em +++ b/ld/emultempl/linux.em @@ -205,6 +205,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em index 9c6ff38..6364f6d 100644 --- a/ld/emultempl/lnk960.em +++ b/ld/emultempl/lnk960.em @@ -342,6 +342,7 @@ struct ld_emulation_xfer_struct ld_lnk960_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/m68kcoff.em b/ld/emultempl/m68kcoff.em index 1ea900a..e46889a 100644 --- a/ld/emultempl/m68kcoff.em +++ b/ld/emultempl/m68kcoff.em @@ -239,6 +239,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index ba51cc0..3a37508 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -2449,6 +2449,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld_${EMULATION_NAME}_list_options, gld_${EMULATION_NAME}_recognized_file, gld_${EMULATION_NAME}_find_potential_libraries, - NULL /* new_vers_pattern. */ + NULL, /* new_vers_pattern. */ + NULL /* extra_map_file_text. */ }; EOF diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index d1575e2..1f78655 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -2213,6 +2213,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld_${EMULATION_NAME}_list_options, gld_${EMULATION_NAME}_recognized_file, gld_${EMULATION_NAME}_find_potential_libraries, - NULL /* new_vers_pattern. */ + NULL, /* new_vers_pattern. */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/rxelf.em b/ld/emultempl/rxelf.em index 5998790..6386abd 100644 --- a/ld/emultempl/rxelf.em +++ b/ld/emultempl/rxelf.em @@ -25,6 +25,8 @@ test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel" fragment <<EOF +#include "elf32-rx.h" + static bfd_boolean no_flag_mismatch_warnings = TRUE; static bfd_boolean ignore_lma = TRUE; @@ -86,3 +88,5 @@ PARSE_AND_LIST_ARGS_CASES=' ' LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=rx_elf_create_output_section_statements + +LDEMUL_EXTRA_MAP_FILE_TEXT=rx_additional_link_map_text diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em index b527bba..e57e1f0 100644 --- a/ld/emultempl/sunos.em +++ b/ld/emultempl/sunos.em @@ -1033,6 +1033,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em index a94f937..c403d56 100644 --- a/ld/emultempl/ticoff.em +++ b/ld/emultempl/ticoff.em @@ -180,6 +180,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld_${EMULATION_NAME}_list_options, NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em index f53a4e3..f8ade99 100644 --- a/ld/emultempl/vanilla.em +++ b/ld/emultempl/vanilla.em @@ -81,6 +81,7 @@ struct ld_emulation_xfer_struct ld_vanilla_emulation = NULL, /* list options */ NULL, /* recognized file */ NULL, /* find_potential_libraries */ - NULL /* new_vers_pattern */ + NULL, /* new_vers_pattern */ + NULL /* extra_map_file_text */ }; EOF diff --git a/ld/ldemul.c b/ld/ldemul.c index edbc9ee..6145c47 100644 --- a/ld/ldemul.c +++ b/ld/ldemul.c @@ -348,3 +348,10 @@ ldemul_new_vers_pattern (struct bfd_elf_version_expr *entry) entry = (*ld_emulation->new_vers_pattern) (entry); return entry; } + +void +ldemul_extra_map_file_text (bfd *abfd, struct bfd_link_info *info, FILE *mapf) +{ + if (ld_emulation->extra_map_file_text) + ld_emulation->extra_map_file_text (abfd, info, mapf); +} diff --git a/ld/ldemul.h b/ld/ldemul.h index a9ea2f6..27b13ad 100644 --- a/ld/ldemul.h +++ b/ld/ldemul.h @@ -94,6 +94,8 @@ extern int ldemul_find_potential_libraries (char *, struct lang_input_statement_struct *); extern struct bfd_elf_version_expr *ldemul_new_vers_pattern (struct bfd_elf_version_expr *); +extern void ldemul_extra_map_file_text + (bfd *, struct bfd_link_info *, FILE *); typedef struct ld_emulation_xfer_struct { /* Run before parsing the command line and script file. @@ -194,6 +196,11 @@ typedef struct ld_emulation_xfer_struct { struct bfd_elf_version_expr * (*new_vers_pattern) (struct bfd_elf_version_expr *); + /* Called when printing the map file, in case there are + emulation-specific sections for it. */ + void (*extra_map_file_text) + (bfd *, struct bfd_link_info *, FILE *); + } ld_emulation_xfer_type; typedef enum { diff --git a/ld/ldlang.c b/ld/ldlang.c index b48a9b3..585914f 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -2120,6 +2120,8 @@ lang_map (void) } lang_statement_iteration++; print_statements (); + + ldemul_extra_map_file_text (link_info.output_bfd, &link_info, config.map_file); } static bfd_boolean |