some simple patches

[Frank Ch. Eigler]

Hi -

On Mon, Jul 18, 2016 at 02:24:19AM -0400, Trevor Saunders wrote:
> [...]
> I checked the resulting generated code for binutils-gdb.git builds fine
> with this.  Is it ok? can someone apply it for me please?

Merged the first two bits.  Not sure where the other
copyright-notice-related change comes in; I don't see the original
line in cvs, nor is that file modified by the other hunks.

- FChE