8 Jun
2020
8 Jun
'20
7:45 a.m.
Hi Waldemar,
Sorry about the patch, wrong rebase!
I've just sent a new version which should get rid of all trailing spaces
and newline before EOF issues.
It should also get rid of the merge conflict in include/elf.h
Cheers!
Yann
On 07/06/2020 00:46, Waldemar Brodkorb wrote:
Hi Yann,
thx for submitting the patch.
It does not apply on git master:
wbx@helium:~/openadk/uClibc-ng-git$ git am ../../kvx/
Applying: kvx: add support for kvx arch to uClibc-ng
.git/rebase-apply/patch:463: space before tab in indent.
*reloc_addr = symbol_addr + rpnt->r_addend;
.git/rebase-apply/patch:464: space before tab in indent.
break;
.git/rebase-apply/patch:591: trailing whitespace.
* Copyright (C) 2018 Kalray Inc.
.git/rebase-apply/patch:596: trailing whitespace.
#error NOT IMPLEMENTED: THIS IS A SKELETON
.git/rebase-apply/patch:749: trailing whitespace.
if (res==0)
error: patch failed: include/elf.h:272
error: include/elf.h: patch does not apply
Patch failed at 0001 kvx: add support for kvx arch to uClibc-ng
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Any idea?
best regards
Waldemar