diff options
| author | Alan Modra <amodra@gmail.com> | 2015-08-17 11:51:44 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2015-08-17 12:07:12 +0930 |
| commit | 919b75f7e28942fe320dc533759f88131f160bf3 (patch) | |
| tree | 4ebcf1b62752af990aae03c497539c41a8a73a5e /opcodes/cgen.sh | |
| parent | 26a4b92c9131ab952f3db9bcafa82fb2360d19b6 (diff) | |
| download | binutils-gdb-919b75f7e28942fe320dc533759f88131f160bf3.tar.gz | |
Trailing space in opcodes/ generated files
HJ recently removed trailing space in binutils files, but unfortunately
they return when regenerating files in opcodes. This fixes the regen
process.
* cgen.sh: Trim trailing space from cgen output.
* ia64-gen.c (print_dependency_table): Don't generate trailing space.
(print_dis_table): Likewise.
* opc2c.c (dump_lines): Likewise.
(orig_filename): Warning fix.
* ia64-asmtab.c: Regenerate.
Diffstat (limited to 'opcodes/cgen.sh')
| -rw-r--r-- | opcodes/cgen.sh | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/opcodes/cgen.sh b/opcodes/cgen.sh index 283649ffc3f..aa8cda2f3ca 100644 --- a/opcodes/cgen.sh +++ b/opcodes/cgen.sh @@ -113,41 +113,48 @@ opcodes) ${extrafile_args} # Customise generated files for the particular architecture. - sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" < ${tmp}-desc.h1 > ${tmp}-desc.h + sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ + -e 's/[ ][ ]*$//' < ${tmp}-desc.h1 > ${tmp}-desc.h ${rootdir}/move-if-change ${tmp}-desc.h ${srcdir}/${prefix}-desc.h sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" < ${tmp}-desc.c1 > ${tmp}-desc.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' \ + < ${tmp}-desc.c1 > ${tmp}-desc.c ${rootdir}/move-if-change ${tmp}-desc.c ${srcdir}/${prefix}-desc.c - sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" < ${tmp}-opc.h1 > ${tmp}-opc.h + sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ + -e 's/[ ][ ]*$//' < ${tmp}-opc.h1 > ${tmp}-opc.h ${rootdir}/move-if-change ${tmp}-opc.h ${srcdir}/${prefix}-opc.h sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" < ${tmp}-opc.c1 > ${tmp}-opc.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' \ + < ${tmp}-opc.c1 > ${tmp}-opc.c ${rootdir}/move-if-change ${tmp}-opc.c ${srcdir}/${prefix}-opc.c case $extrafiles in *opinst*) sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" < ${tmp}-opinst.c1 >${tmp}-opinst.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' \ + < ${tmp}-opinst.c1 >${tmp}-opinst.c ${rootdir}/move-if-change ${tmp}-opinst.c ${srcdir}/${prefix}-opinst.c ;; esac cat ${srcdir}/cgen-ibld.in ${tmp}-ibld.in1 | \ sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" > ${tmp}-ibld.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' > ${tmp}-ibld.c ${rootdir}/move-if-change ${tmp}-ibld.c ${srcdir}/${prefix}-ibld.c sed -e "/ -- assembler routines/ r ${tmp}-asm.in1" ${srcdir}/cgen-asm.in \ | sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" > ${tmp}-asm.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' \ + > ${tmp}-asm.c ${rootdir}/move-if-change ${tmp}-asm.c ${srcdir}/${prefix}-asm.c sed -e "/ -- disassembler routines/ r ${tmp}-dis.in1" ${srcdir}/cgen-dis.in \ | sed -e "s/@ARCH@/${ARCH}/g" -e "s/@arch@/${arch}/g" \ - -e "s/@prefix@/${prefix}/" > ${tmp}-dis.c + -e "s/@prefix@/${prefix}/" -e 's/[ ][ ]*$//' \ + > ${tmp}-dis.c ${rootdir}/move-if-change ${tmp}-dis.c ${srcdir}/${prefix}-dis.c # Remove temporary files. |