On Tue, 2014-05-27 at 22:05 +0200, Mark Wielaard wrote:
> Updated patch attached.
>
> commit 22497096e8759b7c73233f2c2f9adff9d2db9ce7
> Author: Mark Wielaard <mjw@redhat.com>
> Date:   Mon May 26 21:28:05 2014 +0200
> 
>     unstrip: Add --force to force combining files when ELF headers don't match.
>     
>     Older versions of GNU binutils strip would drop some ELF header flags.
>     Causing the main ELF file and the separate .debug file to have mismatched
>     ELF header fields. Unfortunately some distros are still shipping such files.
>     eu-unstrip doesn't want to recombine such files. Add a more explicit
>     explanation which fields don't match and provide a --force, -F flag to
>     force combining such files anyway (producing a warning).
>     
>     https://bugzilla.redhat.com/show_bug.cgi?id=698005
>     https://bugzilla.redhat.com/show_bug.cgi?id=806474
>     
>     Signed-off-by: Mark Wielaard <mjw@redhat.com>

I pushed this variant to master.