Re: gcc-vax in NetBSD-9.0: help needed to test patches

[emu <e2kcpu%gmail.com@localhost>]

On 2020-06-30 07:47, Kalvis Duckmanton wrote:
> Hi,
> I'd very much appreciate it if someone (or many someones) could try
> the changes out please.  I'm more than happy to give further details
> of what each one is supposed to be fixing.
>
> To apply them, extract vax_gcc_patches.tar.gz somewhere convenient,
> move *.patch and patch.sh to the root of the NetBSD source tree, then
> run patch.sh 


I tried today, with a cvs checkout of few hours ago, one patch gets
rejected?


BEVAX2# ./patch.sh
01-pr-50384.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
b/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
|index 17dac16c2daf..a9cfc478e2db 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/builtins.md using
Plan A...
Hunk #1 succeeded at 32.
Hunk #2 succeeded at 49.
done
02-crt-bug.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/lib/csu/arch/vax/crtbegin.S b/lib/csu/arch/vax/crtbegin.S
|index 208c4658a973..207a9d03ec44 100644
|--- a/lib/csu/arch/vax/crtbegin.S
|+++ b/lib/csu/arch/vax/crtbegin.S
--------------------------
Patching file lib/csu/arch/vax/crtbegin.S using Plan A...
Hunk #1 succeeded at 132.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/libexec/ld.elf_so/arch/vax/mdreloc.c
b/libexec/ld.elf_so/arch/vax/mdreloc.c
|index 0528514560fd..12524505404a 100644
|--- a/libexec/ld.elf_so/arch/vax/mdreloc.c
|+++ b/libexec/ld.elf_so/arch/vax/mdreloc.c
--------------------------
Patching file libexec/ld.elf_so/arch/vax/mdreloc.c using Plan A...
Hunk #1 succeeded at 58.
done
02-stdio-wcio-bug.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/lib/libc/stdio/wcio.h b/lib/libc/stdio/wcio.h
|index 7fb7711dff24..af09366657cc 100644
|--- a/lib/libc/stdio/wcio.h
|+++ b/lib/libc/stdio/wcio.h
--------------------------
Patching file lib/libc/stdio/wcio.h using Plan A...
Hunk #1 succeeded at 49.
done
03-pr-44155-implement-c++-exceptions.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/elf.h
b/external/gpl3/gcc/dist/gcc/config/vax/elf.h
|index 5ebda1678b75..30d8f4fc04d1 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/elf.h
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/elf.h
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/elf.h using Plan A...
Hunk #1 succeeded at 45.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/vax.c
b/external/gpl3/gcc/dist/gcc/config/vax/vax.c
|index e8e10a635b6d..db18b96fc0f4 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.c
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.c
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/vax.c using Plan A...
Hunk #1 succeeded at 192 (offset 8 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/vax.h
b/external/gpl3/gcc/dist/gcc/config/vax/vax.h
|index 05dc44b17c78..677e39960024 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.h
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.h
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/vax.h using Plan A...
Hunk #1 succeeded at 151 (offset -18 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/vax.md
b/external/gpl3/gcc/dist/gcc/config/vax/vax.md
|index 4fc60eefbc6c..a146be6f7cee 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.md
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.md
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/vax.md using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 1470.
done
04-zero-extract-mask.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/vax.c
b/external/gpl3/gcc/dist/gcc/config/vax/vax.c
|index db18b96fc0f4..1621aa56b57b 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.c
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.c
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/vax.c using Plan A...
Hunk #1 succeeded at 590 (offset 8 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/config/vax/vax.md
b/external/gpl3/gcc/dist/gcc/config/vax/vax.md
|index a146be6f7cee..5b0bcf9843a1 100644
|--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.md
|+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.md
--------------------------
Patching file external/gpl3/gcc/dist/gcc/config/vax/vax.md using Plan A...
Hunk #1 succeeded at 941.
done
05-mem-subregs.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/external/gpl3/gcc/dist/gcc/recog.c
b/external/gpl3/gcc/dist/gcc/recog.c
|index 63cdc237240b..a842496785df 100644
|--- a/external/gpl3/gcc/dist/gcc/recog.c
|+++ b/external/gpl3/gcc/dist/gcc/recog.c
--------------------------
Patching file external/gpl3/gcc/dist/gcc/recog.c using Plan A...
Hunk #1 failed at 1011.
1 out of 1 hunks failed--saving rejects to
external/gpl3/gcc/dist/gcc/recog.c.rej

---------------------------------------------------------------------------------------------------------

content of recog.c.rej:

@ -1011,8 +1011,12 @@
      might be called from cleanup_subreg_operands.
 
      ??? This is a kludge.  */
-      if (!reload_completed && SUBREG_BYTE (op) != 0
-      && MEM_P (sub))
+      if (!reload_completed
+          && MEM_P (sub)
+          && (SUBREG_BYTE (op) > GET_MODE_SIZE (GET_MODE (sub))
+              || SUBREG_BYTE (op) % GET_MODE_SIZE (mode) != 0
+              )
+          )
     return 0;
 
 #ifdef CANNOT_CHANGE_MODE_CLASS