Module Name: src
Committed By: martin
Date: Sun Oct 8 18:44:48 UTC 2023
Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-10]: dse.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #394):
[accidentaly skiped during initial pullup handling]
external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.15
external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.16
(applied to external/gpl3/gcc/dist/gcc/dse.c)
gcc.old: Fix my regression for PR port-vax/57646 patch [5/21]
Add a part of the original diff provided by Kalvis Duckmanton,
which I carelessly dropped during NB_FIX_VAX_BACKEND addition.
Fix ICE in DSE phase for native GCC. Now, pkgsrc/lang/perl5
successfully builds again.
gcc.old: Clarify PR port-vax/57646 patch [5/21]. NFC
Restore ``else'' in the original patch. NFC but better to fit into
upstream code here.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/external/gpl3/gcc/dist/gcc/dse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/dse.c
diff -u src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.1 src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.2
--- src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.1 Sun Oct 8 14:35:18 2023
+++ src/external/gpl3/gcc/dist/gcc/dse.c Sun Oct 8 18:44:48 2023
@@ -298,7 +298,11 @@ public:
/* Return a bitmask with the first N low bits set. */
static unsigned HOST_WIDE_INT
+#ifdef NB_FIX_VAX_BACKEND
+lowpart_bitmask (unsigned int n)
+#else
lowpart_bitmask (int n)
+#endif
{
unsigned HOST_WIDE_INT mask = HOST_WIDE_INT_M1U;
#ifdef NB_FIX_VAX_BACKEND
@@ -1346,7 +1350,7 @@ all_positions_needed_p (store_info *s_in
return true;
}
#ifdef NB_FIX_VAX_BACKEND
- if (const_start >= HOST_BITS_PER_WIDE_INT || const_start < 0)
+ else if (const_start >= HOST_BITS_PER_WIDE_INT || const_start < 0)
return true;
#endif
else
