From c43cc9ffbac15580ba3e8ef74eeb71a3fdfb2786 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 26 Oct 2007 06:33:59 +0000 Subject: [PATCH] PR 5215 * genscripts.sh: Move bash script to.. * genscrba.sh: ..here. --- ld/ChangeLog | 8 +++++++- ld/genscrba.sh | 14 ++++++++++++++ ld/genscripts.sh | 14 +------------- 3 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 ld/genscrba.sh diff --git a/ld/ChangeLog b/ld/ChangeLog index 104a0ff8a2a..5fc553ca791 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2007-10-26 Alan Modra + + PR 5215 + * genscripts.sh: Move bash script to.. + * genscrba.sh: ..here. + 2007-10-25 Pedro Alves * pe-dll.c (autofilter_symbollist_generic) @@ -45,7 +51,7 @@ 2007-10-01 Nick Clifton PR linker/4844 - * genscript.sh: Add support for generating a .xa script for use + * genscripts.sh: Add support for generating a .xa script for use with the --auto-import option. * ld.texinfo: Document the new behaviour of the --auto-import option. diff --git a/ld/genscrba.sh b/ld/genscrba.sh new file mode 100644 index 00000000000..621de7ab47a --- /dev/null +++ b/ld/genscrba.sh @@ -0,0 +1,14 @@ +#!/bin/bash +source_em() +{ + local current_script="$em_script" + em_script=$1 + . $em_script + em_script=$current_script +} +fragment() +{ + local lineno=$[${BASH_LINENO[0]} + 1] + echo >> e${EMULATION_NAME}.c "#line $lineno \"$em_script\"" + cat >> e${EMULATION_NAME}.c +} diff --git a/ld/genscripts.sh b/ld/genscripts.sh index 10623ecba5f..46af1da0896 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -402,19 +402,7 @@ case " $EMULATION_LIBPATH " in esac if test -n "${BASH+set}"; then - source_em() - { - local current_script="$em_script" - em_script=$1 - . $em_script - em_script=$current_script - } - fragment() - { - local lineno=$[${BASH_LINENO[0]} + 1] - echo >> e${EMULATION_NAME}.c "#line $lineno \"$em_script\"" - cat >> e${EMULATION_NAME}.c - } + . ${srcdir}/genscrba.sh else source_em() { -- 2.30.2