Skip to content

Commit a123eb8

Browse files
unobeatoomic
authored andcommitted
Plan9/9front i386 fixes
1 parent be2a5c5 commit a123eb8

File tree

18 files changed

+756
-263
lines changed

18 files changed

+756
-263
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,7 @@ Rocco Caputo <troc@netrus.net>
11041104
Roderick Schertler <roderick@argon.org>
11051105
Rodger Anderson <rodger@boi.hp.com>
11061106
Rodolfo Carvalho <rhcarvalho@gmail.com>
1107+
Romano <unobe@cpan.org>
11071108
Ronald F. Guilmette <rfg@monkeys.com>
11081109
Ronald J. Kimball <rjk@linguist.dartmouth.edu>
11091110
Ronald Schmidt <RonaldWS@aol.com>

MANIFEST

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5127,20 +5127,23 @@ perly.c parser code (NOT derived from perly.y)
51275127
perly.h header file for perly.c; derived from perly.y
51285128
perly.tab parser state tables; derived from perly.y
51295129
perly.y Yacc grammar for perl
5130-
plan9/aperl Shell to make Perl error messages Acme-friendly
5130+
plan9/9front.patch Plan9 port: patch for 9front-specific flavor of Plan 9
5131+
plan9/aperl Plan9 port: shell to make Perl error messages Acme-friendly
51315132
plan9/arpa/inet.h Plan9 port: replacement C header file
51325133
plan9/buildinfo Plan9 port: configuration information
51335134
plan9/config.plan9 Plan9 port: config.h template
5134-
plan9/config_h.sample Plan9 port: 5.8.0 sample config.h
5135-
plan9/config_sh.sample Plan9 port: 5.8.0 sample config.sh
5135+
plan9/config_h.sample Plan9 port: 5.32.0 sample config.h
5136+
plan9/config_sh.sample Plan9 port: 5.32.0 sample config.sh
51365137
plan9/exclude Plan9 port: tests to skip
51375138
plan9/fndvers Plan9 port: update Perl version in config.plan9
51385139
plan9/genconfig.pl Plan9 port: generate config.sh
5140+
plan9/math.h Plan9 port: Plan9-specific math.h
51395141
plan9/mkfile Plan9 port: Mk driver for build
51405142
plan9/myconfig.plan9 Plan9 port: script to print config summary
51415143
plan9/plan9.c Plan9 port: Plan9-specific C routines
51425144
plan9/plan9ish.h Plan9 port: Plan9-specific C header file
51435145
plan9/setup.rc Plan9 port: script for easy build+install
5146+
plan9/uninstall.rc Plan9 port: uninstall script
51445147
plan9/versnum Plan9 port: script to print version number
51455148
pod/buildtoc Generate pod/perltoc.pod and pod/roffitall
51465149
pod/Makefile.SH generate Makefile which makes pods into something else

Porting/exec-bit.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ installman
2323
makedepend.SH
2424
metaconfig.SH
2525
myconfig.SH
26+
plan9/fndvers
27+
plan9/setup.rc
28+
plan9/uninstall.rc
2629
regen/embed.pl
2730
regen/feature.pl
2831
regen/keywords.pl

plan9/9front.patch

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
diff --git a/dist/IO/poll.h b/dist/IO/poll.h
2+
--- a/dist/IO/poll.h
3+
+++ b/dist/IO/poll.h
4+
@@ -22,10 +22,12 @@
5+
6+
#define EMULATE_POLL_WITH_SELECT
7+
8+
+#ifdef __VMS
9+
#ifdef poll
10+
# undef poll
11+
#endif
12+
#define poll Perl_my_poll
13+
+#endif
14+
15+
typedef struct pollfd {
16+
int fd;
17+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
18+
--- a/ext/Errno/Errno_pm.PL
19+
+++ b/ext/Errno/Errno_pm.PL
20+
@@ -125,6 +125,8 @@ sub get_files {
21+
# VMS keeps its include files in system libraries
22+
if ($^O eq 'VMS') {
23+
$file{'Sys$Library:DECC$RTLDEF.TLB'} = 1;
24+
+ } elsif ($^O eq 'plan9') {
25+
+ $file{'/sys/include/ape/errno.h'} = 1;
26+
} elsif ($^O eq 'os390') {
27+
# OS/390 C compiler doesn't generate #file or #line directives
28+
$file{'/usr/include/errno.h'} = 1;
29+
diff --git a/sv.c b/sv.c
30+
--- a/sv.c
31+
+++ b/sv.c
32+
@@ -876,10 +876,10 @@
33+
U8 body_size; /* Size to allocate */
34+
U8 copy; /* Size of structure to copy (may be shorter) */
35+
U8 offset; /* Size of unalloced ghost fields to first alloced field*/
36+
- PERL_BITFIELD8 type : 4; /* We have space for a sanity check. */
37+
- PERL_BITFIELD8 cant_upgrade : 1;/* Cannot upgrade this type */
38+
- PERL_BITFIELD8 zero_nv : 1; /* zero the NV when upgrading from this */
39+
- PERL_BITFIELD8 arena : 1; /* Allocated from an arena */
40+
+ PERL_BITFIELD8 type; /* We have space for a sanity check. */
41+
+ PERL_BITFIELD8 cant_upgrade;/* Cannot upgrade this type */
42+
+ PERL_BITFIELD8 zero_nv; /* zero the NV when upgrading from this */
43+
+ PERL_BITFIELD8 arena; /* Allocated from an arena */
44+
U32 arena_size; /* Size of arena to allocate */
45+
};
46+

plan9/aperl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
# aperl:
44
# Executes perl command and alters stderr to produce Acme-friendly error messages
55
# Created 02-JUL-1996, Luther Huffman, lutherh@stratcom.com
6+
# Modified May 2020, David Romano, unobe@cpan.org
67

7-
/bin/perl $* |[2] /bin/perl -pe 's/ line (\d+)/:$1/' >[1=2]
8+
/bin/perl-_P9P_VERSION $* |[2] /bin/perl-_P9P_VERSION -pe 's/ line (\d+)/:$1/' >[1=2]

plan9/buildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
p9pvers = 5.008
1+
p9pvers = 5.32.0

0 commit comments

Comments
 (0)