Hi Segher,
On 2019/2/20 AM6:24, Segher Boessenkool wrote:
Hi!
On Tue, Feb 19, 2019 at 01:23:53AM -0600, luo...@linux.ibm.com wrote:
This is a backport of r255555, r257253 and r258137 of trunk to gcc-7-branch.
The patches were on trunk before GCC 8 forked already. Totally 5 files need
mannual resolve due to code changes for r255555. r257253 and r258137 are
dependent testcases require vsx support need merge to avoid regression.
Could you show what changes you needed, please? As patches for example.
It's not clear from the log :-(
I generate the r255555 patch from trunk and use the "git am" to apply it
to gcc-7-branch to backport, error happens as below:
[gcc-7-branch] $ git am 0001-gcc-ChangeLog.patch
Applying: gcc/ChangeLog:
error: patch failed: gcc/ChangeLog:1
error: gcc/ChangeLog: patch does not apply
error: patch failed: gcc/config/rs6000/altivec.h:458
error: gcc/config/rs6000/altivec.h: patch does not apply
error: patch failed: gcc/config/rs6000/rs6000-c.c:3618
error: gcc/config/rs6000/rs6000-c.c: patch does not apply
error: patch failed: gcc/doc/extend.texi:17382
error: gcc/doc/extend.texi: patch does not apply
error: patch failed: gcc/testsuite/ChangeLog:1
error: gcc/testsuite/ChangeLog: patch does not apply
error: patch failed: gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c:16
error: gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c: patch does not
apply
error: patch failed: gcc/testsuite/gcc.target/powerpc/builtins-3.c:88
error: gcc/testsuite/gcc.target/powerpc/builtins-3.c: patch does not apply
error: patch failed: gcc/testsuite/gcc.target/powerpc/vsx-vector-6.c:1
error: gcc/testsuite/gcc.target/powerpc/vsx-vector-6.c: patch does not apply
Patch failed at 0001 gcc/ChangeLog:
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".
The 5 files (altivec.h, rs6000-c.c, extend.texi, etc.) couldn't apply
due to some dependent patches in trunk not backported, should I find all
the dependency patches(maybe many patches required) and backport them
all to avoid such errors or just resolve these errors in this patch?
that's why I use the word "resolve" below, will merge or rebase be
better to understand?
Then I use command "git apply 0001-gcc-ChangeLog.patch --reject" and
manually fix the rejected hunks. Do you have better suggested steps for
such kind of backport, please? Thanks.
2019-01-14 Luo Xiong Hu <luo...@linux.ibm.com>
Backport from trunk. Mannually resolve 3 files:
Two spaces after a full stop. "Manually", one "n".
* config/rs6000/altivec.h (vec_extract_fp32_from_shorth,
vec_extract_fp32_from_shortl): Resolve new #defines.
I don't know what this means, "resolve"?
* config/rs6000/rs6000-c.c (ALTIVEC_BUILTIN_VEC_SLD): Resolve
new expensions.
Same. (And "expansions"? Or what did you mean?).
"expansions" means macro expansion is copied from previous ChangeLog,
the original ChangeLog is:
2017-12-11 Carl Love <c...@us.ibm.com>
* config/rs6000/altivec.h (vec_extract_fp32_from_shorth,
vec_extract_fp32_from_shortl]): Add #defines.
* config/rs6000/rs6000-builtin.def (VSLDOI_2DI): Add macro expansion.
* config/rs6000/rs6000-c.c (ALTIVEC_BUILTIN_VEC_UNPACKH,
ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VEC_AND,
ALTIVEC_BUILTIN_VEC_SLD, ALTIVEC_BUILTIN_VEC_SRL,
ALTIVEC_BUILTIN_VEC_SRO, ALTIVEC_BUILTIN_VEC_SLD,
ALTIVEC_BUILTIN_VEC_SLL): Add expansions.
* doc/extend.texi: Add documentation for the added builtins.
Xionghu
* doc/extend.texi: (vec_sld, vec_sll, vec_srl, vec_sro,
vec_unpackh, vec_unpackl, test_vsi_packsu_vssi_vssi, vec_packsu,
vec_cmpne): Resolve new documentation.
2017-12-11 Carl Love <c...@us.ibm.com>
An empty line before a new changelog please (before date and author).
Segher
