From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 692 invoked by alias); 22 Apr 2014 20:55:19 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 680 invoked by uid 89); 22 Apr 2014 20:55:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 22 Apr 2014 20:55:12 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3MKt9v9022771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Apr 2014 16:55:09 -0400 Received: from greed.delorie.com (ovpn-113-48.phx2.redhat.com [10.3.113.48]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3MKt8uX019698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 22 Apr 2014 16:55:08 -0400 Received: from greed.delorie.com (greed.delorie.com [127.0.0.1]) by greed.delorie.com (8.14.4/8.14.4) with ESMTP id s3MKt7An011635; Tue, 22 Apr 2014 16:55:07 -0400 Received: (from dj@localhost) by greed.delorie.com (8.14.4/8.14.4/Submit) id s3MKt75Y011634; Tue, 22 Apr 2014 16:55:07 -0400 Date: Tue, 22 Apr 2014 20:55:00 -0000 Message-Id: <201404222055.s3MKt75Y011634@greed.delorie.com> From: DJ Delorie To: Tristan Gingold CC: binutils@sourceware.org In-reply-to: <15F27C34-BFCC-4A1D-A705-C3AEB0464BF2@adacore.com> (message from Tristan Gingold on Fri, 11 Apr 2014 09:10:48 +0200) Subject: Re: [rfc] new bfd hook: additional link map text References: <201404110214.s3B2E2IQ016910@greed.delorie.com> <15F27C34-BFCC-4A1D-A705-C3AEB0464BF2@adacore.com> X-IsSubscribed: yes X-SW-Source: 2014-04/txt/msg00223.txt.bz2 > > This is an RFC for a new bfd target hook "additional_link_map_text" > > that's used to give targets a way to add target-specific text to the > > end of the linker's map file (-Map). This extra text is added at the > > end of the map file, in case there are programs which parse map files > > (where the extra text might confuse the parser, if encountered early). > > > > Tested with --enable-targets=all although I had to manually fix > > today's AVR reloc patch bug. > > > > I have a follow-up patch that adds a new feature to the rx target > > which includes link map text, too... > > > > Comments? > > Why not adding a new field in ld_emulation_xfer_struct ? Looks lighter. Attached, mostly. Git is giving me a diff relative to the previous patch. The one catch is that there isn't a good place to put the function prototype if the function happens to need to be defined inside bfd, which in my case it does since I need to hook a few other points in the process to set up the data I'm printing. With the bfd hook, everything's in one file, so prototypes aren't a problem and all the functions can be static. 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..b0e4ead 100644 --- a/ld/emultempl/rxelf.em +++ b/ld/emultempl/rxelf.em @@ -25,6 +25,8 @@ test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel" fragment <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) + { + fprintf(stderr, "CALLING IT!\n"); + ld_emulation->extra_map_file_text (abfd, info, mapf); + } + else + fprintf(stderr, "SKIP!\n"); +} 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 3861846..596aecc 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -2124,7 +2124,7 @@ lang_map (void) lang_statement_iteration++; print_statements (); - bfd_additional_link_map_text (link_info.output_bfd, &link_info, config.map_file); + ldemul_extra_map_file_text (link_info.output_bfd, &link_info, config.map_file); } static bfd_boolean