Change 13566 by jhi@alpha on 2001/12/09 20:55:32
Apply NetBSD patch-ae: another gcc sparc64 bug.
Affected files ...
.... //depot/perl/regcomp.c#254 edit
Differences ...
==== //depot/perl/regcomp.c#254 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c.~1~ Sun Dec 9 14:00:05 2001
+++ perl/regcomp.c Sun Dec 9 14:00:05 2001
@@ -658,6 +658,17 @@
}
}
+/*
+ * There are strange code-generation bugs caused on sparc64 by gcc-2.95.2.
+ * These need to be revisited when a newer toolchain becomes available.
+ */
+#if defined(__sparc64__) && defined(__GNUC__)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+# undef SPARC64_GCC_WORKAROUND
+# define SPARC64_GCC_WORKAROUND 1
+# endif
+#endif
+
/* REx optimizer. Converts nodes into quickier variants "in place".
Finds fixed substrings. */
@@ -1203,11 +1214,28 @@
int counted = mincount != 0;
if (data->last_end > 0 && mincount != 0) { /* Ends with a string.
*/
+#if defined(SPARC64_GCC_WORKAROUND)
+ I32 b = 0;
+ STRLEN l = 0;
+ char *s = NULL;
+ I32 old = 0;
+
+ if (pos_before >= data->last_start_min)
+ b = pos_before;
+ else
+ b = data->last_start_min;
+
+ l = 0;
+ s = SvPV(data->last_found, l);
+ old = b - data->last_start_min;
+
+#else
I32 b = pos_before >= data->last_start_min
? pos_before : data->last_start_min;
STRLEN l;
char *s = SvPV(data->last_found, l);
I32 old = b - data->last_start_min;
+#endif
if (UTF)
old = utf8_hop((U8*)s, old) - (U8*)s;
End of Patch.
