From 45455cddda802f883f8ea8f341d68ccbb8c4735b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 12 Sep 1999 16:59:49 +0000 Subject: [PATCH] 1999-09-12 Donn Terry * ld.h (ld_abort): Declare. (abort): Define. * ldmisc.c (ld_abort): Define. --- ld/ChangeLog | 8 ++++++++ ld/ld.h | 11 +++++++++++ ld/ldmisc.c | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index f827b6b0451..ee9edf618ae 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,9 @@ 1999-09-12 Ian Lance Taylor + * pe.em: Don't include "../bfd/libbfd.h". + (gld_${EMULATION_NAME}_after_open): Use xmalloc rather than + bfd_alloc. + * pe-dll.h: New file. * pe-dll.c: Include "pe-dll.h". Mark unused arguments as needed to avoid warnings. @@ -23,6 +27,10 @@ 1999-09-12 Donn Terry + * ld.h (ld_abort): Declare. + (abort): Define. + * ldmisc.c (ld_abort): Define. + * scripttempl/pe.sc: Use ${ENTRY} rather than _mainCRTStartup. Move .bss section after .rdata. Move .reloc section after .rsrc. diff --git a/ld/ld.h b/ld/ld.h index bca7462dc4f..91565a83b32 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -223,4 +223,15 @@ extern void add_cref PARAMS ((const char *, bfd *, asection *, bfd_vma)); extern void output_cref PARAMS ((FILE *)); extern void check_nocrossrefs PARAMS ((void)); +extern void ld_abort PARAMS ((const char *, int, const char *)) + ATTRIBUTE_NORETURN; + +/* If gcc, we can give a function name, too. */ +#if !defined (__GNUC__) || __GNUC_MINOR__ <= 5 +#define __PRETTY_FUNCTION__ ((char*) NULL) +#endif + +#undef abort +#define abort() ld_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__) + #endif diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 8fab22825f7..267dff14bf2 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -536,3 +536,22 @@ print_nl () { fprintf (config.map_file, "\n"); } + +/* A more or less friendly abort message. In ld.h abort is defined to + call this function. */ + +void +ld_abort (file, line, fn) + const char *file; + int line; + const char *fn; +{ + if (fn != NULL) + einfo (_("%P: internal error: aborting at %s line %d in %s\n"), + file, line, fn); + else + einfo (_("%P: internal error: aborting at %s line %d\n"), + file, line); + einfo (_("%P%F: please report this bug\n")); + xexit (1); +} -- 2.30.2