Change 18587 by jhi@kosh on 2003/01/26 09:29:52
Integrate:
[ 18583]
Plan 9 compiler can't return quads from the ?: (condop).
(There may be more spots like this, so a Configure test
maybe in order, but this works for now.) From Russ Cox.
[ 18584]
Plan 9 doesn't really have the symlink API, from Russ Cox.
[ 18586]
Plan 9 doesn't do nm, from Russ Cox.
Affected files ...
... //depot/maint-5.8/perl/Configure#12 integrate
... //depot/maint-5.8/perl/ext/PerlIO/via/via.xs#5 integrate
... //depot/maint-5.8/perl/plan9/plan9ish.h#2 integrate
Differences ...
==== //depot/maint-5.8/perl/Configure#12 (xtext) ====
Index: perl/Configure
--- perl/Configure#11~18566~ Wed Jan 22 10:32:41 2003
+++ perl/Configure Sun Jan 26 01:29:52 2003
@@ -5470,6 +5470,11 @@
echo "'nm' won't be sufficient on this sytem." >&4
dflt=n
fi
+ if $test "$osname" = plan9; then
+ echo " "
+ echo "Whoops! Nm won't work on Plan 9!" >&4
+ dflt=n
+ fi
;;
esac
case "$dflt" in
==== //depot/maint-5.8/perl/ext/PerlIO/via/via.xs#5 (text) ====
Index: perl/ext/PerlIO/via/via.xs
--- perl/ext/PerlIO/via/via.xs#4~18347~ Sun Dec 22 22:37:31 2002
+++ perl/ext/PerlIO/via/via.xs Sun Jan 26 01:29:52 2003
@@ -346,7 +346,7 @@
return SvIV(result);
}
-IV
+Off_t
PerlIOVia_seek(pTHX_ PerlIO * f, Off_t offset, int whence)
{
PerlIOVia *s = PerlIOSelf(f, PerlIOVia);
@@ -356,7 +356,14 @@
SV *result =
PerlIOVia_method(aTHX_ f, MYMethod(SEEK), G_SCALAR, offsv, whsv,
Nullsv);
+#if Off_t_size == 8 && defined(CONDOP_SIZE) && CONDOP_SIZE < Off_t_size
+ if (result)
+ return (Off_t) SvIV(result);
+ else
+ return (Off_t) -1;
+#else
return (result) ? SvIV(result) : -1;
+#endif
}
Off_t
==== //depot/maint-5.8/perl/plan9/plan9ish.h#2 (text) ====
Index: perl/plan9/plan9ish.h
--- perl/plan9/plan9ish.h#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/plan9/plan9ish.h Sun Jan 26 01:29:52 2003
@@ -131,4 +131,10 @@
/* For use by POSIX.xs */
extern int tcsendbreak(int, int);
+#define CONDOP_SIZE 4 /* The Plan 9 compiler cannot return quads from ?: */
+
+#undef HAS_SYMLINK /* Plan 9 doesn't really have these. */
+#undef HAS_LSTAT
+#undef HAS_READLINK
+
#endif /* __PLAN9ISH_H__ */
End of Patch.
