From: Alexander Shiryaev Date: Wed, 21 Aug 2013 12:45:17 +0000 (+0400) Subject: OpenBSD 5.2 -> 5.4 (mostly clock_t 32 -> 64 bit related) X-Git-Url: https://deadsoftware.ru/gitweb?a=commitdiff_plain;ds=sidebyside;h=36bc6a45cb0f426f1027926090a8bc560c54f825;p=bbcp.git OpenBSD 5.2 -> 5.4 (mostly clock_t 32 -> 64 bit related) --- diff --git a/new/_OpenBSD_/Host/Mod/Files.odc b/new/_OpenBSD_/Host/Mod/Files.odc index d0b5507..2faa926 100644 Binary files a/new/_OpenBSD_/Host/Mod/Files.odc and b/new/_OpenBSD_/Host/Mod/Files.odc differ diff --git a/new/_OpenBSD_/Lin/Mod/Dl.txt b/new/_OpenBSD_/Lin/Mod/Dl.txt index 4df672d..ed81f4d 100644 --- a/new/_OpenBSD_/Lin/Mod/Dl.txt +++ b/new/_OpenBSD_/Lin/Mod/Dl.txt @@ -1,9 +1,9 @@ MODULE LinDl ["ld.so"]; (* - A. V. Shiryaev, 2012.09 + A. V. Shiryaev, 2012.09, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Mod/Ioctl.txt b/new/_OpenBSD_/Lin/Mod/Ioctl.txt index b3f0f06..51947f4 100644 --- a/new/_OpenBSD_/Lin/Mod/Ioctl.txt +++ b/new/_OpenBSD_/Lin/Mod/Ioctl.txt @@ -1,9 +1,9 @@ -MODULE LinIoctl ["libc.so.66.0"]; +MODULE LinIoctl ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Mod/Libc.txt b/new/_OpenBSD_/Lin/Mod/Libc.txt index a447b27..26bf4ac 100644 --- a/new/_OpenBSD_/Lin/Mod/Libc.txt +++ b/new/_OpenBSD_/Lin/Mod/Libc.txt @@ -1,7 +1,7 @@ -MODULE LinLibc ["libc.so.66.0"]; +MODULE LinLibc ["libc.so.70.0"]; (* - OpenBSD 5.2 + OpenBSD 5.4 i386 *) @@ -378,14 +378,14 @@ MODULE LinLibc ["libc.so.66.0"]; size_t* = INTEGER; ssize_t* = INTEGER; off_t* = LONGINT; - clock_t* = INTEGER; - time_t* = INTEGER; + clock_t* = LONGINT; + time_t* = LONGINT; mode_t* = SET; pid_t* = INTEGER; uid_t* = INTEGER; gid_t* = INTEGER; dev_t* = INTEGER; - ino_t* = INTEGER; + ino_t* = LONGINT; nlink_t* = INTEGER; int8_t* = SHORTCHAR; u_int8_t* = SHORTCHAR; @@ -406,7 +406,7 @@ MODULE LinLibc ["libc.so.66.0"]; tmDesc* = RECORD [untagged] (* NOTE: check record size *) (* tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec, tm_wday [ , tm_gmtoff ] *) - (* OpenBSD 5.2 /usr/include/time.h *) + (* OpenBSD 5.4 /usr/include/time.h *) tm_sec*: int; (* seconds after the minute [0-60] *) tm_min*: int; (* minutes after the hour [0-59] *) tm_hour*: int; (* hours since midnight [0-23] *) @@ -423,7 +423,7 @@ MODULE LinLibc ["libc.so.66.0"]; Ptrsiginfo_t* = POINTER TO siginfo_t; siginfo_t = RECORD [untagged] (* si_code, fault address *) - (* OpenBSD 5.2 /usr/include/sys/siginfo.h *) + (* OpenBSD 5.4 /usr/include/sys/siginfo.h *) si_signo*: int; (* signal from signal.h *) si_code*: int; (* code from above *) si_errno*: int; (* error from errno.h *) @@ -441,8 +441,8 @@ MODULE LinLibc ["libc.so.66.0"]; END; _cld*: RECORD [untagged] _utime*: clock_t; - _status*: int; _stime*: clock_t; + _status*: int; END; END; END; @@ -456,7 +456,7 @@ MODULE LinLibc ["libc.so.66.0"]; Ptrucontext_t* = POINTER TO ucontext_t; ucontext_t = RECORD [untagged] (* IP, SP, FP *) - (* OpenBSD 5.2 /usr/include/i386/signal.h struct sigcontext *) + (* OpenBSD 5.4 /usr/include/i386/signal.h struct sigcontext *) sc_gs*: int; sc_fs*: int; sc_es*: int; @@ -475,14 +475,14 @@ MODULE LinLibc ["libc.so.66.0"]; sc_esp*: int; sc_ss*: int; - sc_onstack*: int; (* sigstack state to restore *) + __sc_unused: int; sc_mask*: int; (* signal mask to restore *) sc_trapno*: int; (* XXX should be above *) sc_err*: int; sc_fpstate*: RECORD [union] - (* OpenBSD 5.2 /usr/include/i386/npx.h union savefpu *) + (* OpenBSD 5.4 /usr/include/i386/npx.h union savefpu *) (* sv_87*: RECORD [untagged] ... @@ -499,7 +499,7 @@ MODULE LinLibc ["libc.so.66.0"]; sa_sigaction*: PROCEDURE [ccall] (sig: INTEGER; siginfo: Ptrsiginfo_t; context: Ptrucontext_t), sa_flags*: intFlags, sa_mask*: sigset_t *) - (* OpenBSD 5.2 /usr/include/sys/signal.h *) + (* OpenBSD 5.4 /usr/include/sys/signal.h *) sa_sigaction*: PROCEDURE [ccall] (sig: int; siginfo: Ptrsiginfo_t; ctx: Ptrucontext_t); sa_mask*: sigset_t; sa_flags*: intFlags; @@ -509,7 +509,7 @@ MODULE LinLibc ["libc.so.66.0"]; (* ss_sp*: PtrVoid, ss_size*: size_t, ss_flags*: intFlags *) - (* OpenBSD 5.2 /usr/include/sys/signal.h *) + (* OpenBSD 5.4 /usr/include/sys/signal.h *) ss_sp*: PtrVoid; (* signal stack base *) ss_size*: size_t; (* signal stack length *) ss_flags*: intFlags; (* SS_DISABLE and/or SS_ONSTACK *) @@ -520,15 +520,14 @@ MODULE LinLibc ["libc.so.66.0"]; NOTE: check record size st_mode*: mode_t, st_size*: off_t, st_mtime*: time_t *) - (* OpenBSD 5.2 /usr/include/sys/stat.h *) + (* OpenBSD 5.4 /usr/include/sys/stat.h *) + st_mode*: mode_t; st_dev*: dev_t; st_ino*: ino_t; - st_mode*: mode_t; st_nlink*: nlink_t; st_uid*: uid_t; st_gid*: gid_t; st_rdev*: dev_t; - st_lspare0*: int32_t; st_atime*: time_t; st_atimensec*: long; @@ -542,11 +541,9 @@ MODULE LinLibc ["libc.so.66.0"]; st_blksize*: u_int32_t; st_flags*: u_int32_t; st_gen*: u_int32_t; - st_lspare1*: int32_t; __st_birthtime*: time_t; __st_birthtimensec*: long; - st_qspare*: ARRAY [untagged] 2 OF int64_t; END; PtrFILE* = PtrVoid; @@ -557,11 +554,13 @@ MODULE LinLibc ["libc.so.66.0"]; (* d_name*: ARRAY [untagged] NAME_MAX + 1 OF SHORTCHAR *) - (* OpenBSD 5.2 /usr/include/sys/dirent.h *) - d_fileno*: u_int32_t; (* file number of entry *) + (* OpenBSD 5.4 /usr/include/sys/dirent.h *) + d_fileno*: ino_t; (* file number of entry *) + d_off*: off_t; (* offset after this entry *) d_reclen*: u_int16_t; (* length of this record *) d_type*: u_int8_t; (* file type, see below *) d_namlen*: u_int8_t; (* length of string in d_name *) + __d_padding: ARRAY [untagged] 4 OF u_int8_t; (* suppress padding after d_name *) d_name*: ARRAY [untagged] 255 + 1 OF SHORTCHAR; END; diff --git a/new/_OpenBSD_/Lin/Mod/Net.txt b/new/_OpenBSD_/Lin/Mod/Net.txt index 95c7e4c..4b74462 100644 --- a/new/_OpenBSD_/Lin/Mod/Net.txt +++ b/new/_OpenBSD_/Lin/Mod/Net.txt @@ -1,9 +1,9 @@ -MODULE LinNet ["libc.so.66.0"]; +MODULE LinNet ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) @@ -131,6 +131,8 @@ MODULE LinNet ["libc.so.66.0"]; IPPROTO_MAX* = 256; IPPROTO_DIVERT* = 258; (* Divert sockets *) IPPROTO_DONE* = 257; + IPPROTO_DIVERT_RESP* = 01H; (* {0} *) (* divert response packets *) + IPPROTO_DIVERT_INIT* = 02H; (* {1} *) (* divert packets initial direction *) (* /usr/include/sys/param.h *) MAXHOSTNAMELEN* = 256; (* max hostname size *) diff --git a/new/_OpenBSD_/Lin/Mod/Termios.txt b/new/_OpenBSD_/Lin/Mod/Termios.txt index 159fe77..a3162c7 100644 --- a/new/_OpenBSD_/Lin/Mod/Termios.txt +++ b/new/_OpenBSD_/Lin/Mod/Termios.txt @@ -1,9 +1,9 @@ -MODULE LinTermios ["libc.so.66.0"]; +MODULE LinTermios ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Mod/gen-Ioctl/Ioctl.txt.templ b/new/_OpenBSD_/Lin/Mod/gen-Ioctl/Ioctl.txt.templ index ba229f5..23a9202 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Ioctl/Ioctl.txt.templ +++ b/new/_OpenBSD_/Lin/Mod/gen-Ioctl/Ioctl.txt.templ @@ -1,9 +1,9 @@ -MODULE LinIoctl ["libc.so.66.0"]; +MODULE LinIoctl ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-dirent b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-dirent index db2c131..1fdc134 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-dirent +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-dirent @@ -1,6 +1,8 @@ - (* OpenBSD 5.2 /usr/include/sys/dirent.h *) - d_fileno*: u_int32_t; (* file number of entry *) + (* OpenBSD 5.4 /usr/include/sys/dirent.h *) + d_fileno*: ino_t; (* file number of entry *) + d_off*: off_t; (* offset after this entry *) d_reclen*: u_int16_t; (* length of this record *) d_type*: u_int8_t; (* file type, see below *) d_namlen*: u_int8_t; (* length of string in d_name *) + __d_padding: ARRAY [untagged] 4 OF u_int8_t; (* suppress padding after d_name *) d_name*: ARRAY [untagged] 255 + 1 OF SHORTCHAR; \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-sigaction b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-sigaction index c5fbd9c..e28a208 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-sigaction +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-sigaction @@ -1,4 +1,4 @@ - (* OpenBSD 5.2 /usr/include/sys/signal.h *) + (* OpenBSD 5.4 /usr/include/sys/signal.h *) sa_sigaction*: PROCEDURE [ccall] (sig: int; siginfo: Ptrsiginfo_t; ctx: Ptrucontext_t); sa_mask*: sigset_t; sa_flags*: intFlags; \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-siginfo b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-siginfo index 0fc315c..18b1899 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-siginfo +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-siginfo @@ -1,4 +1,4 @@ - (* OpenBSD 5.2 /usr/include/sys/siginfo.h *) + (* OpenBSD 5.4 /usr/include/sys/siginfo.h *) si_signo*: int; (* signal from signal.h *) si_code*: int; (* code from above *) si_errno*: int; (* error from errno.h *) @@ -16,8 +16,8 @@ END; _cld*: RECORD [untagged] _utime*: clock_t; - _status*: int; _stime*: clock_t; + _status*: int; END; END; END; diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stack b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stack index 5439be7..3136138 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stack +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stack @@ -1,4 +1,4 @@ - (* OpenBSD 5.2 /usr/include/sys/signal.h *) + (* OpenBSD 5.4 /usr/include/sys/signal.h *) ss_sp*: PtrVoid; (* signal stack base *) ss_size*: size_t; (* signal stack length *) ss_flags*: intFlags; (* SS_DISABLE and/or SS_ONSTACK *) \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stat b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stat index bcea6bc..20f9c0a 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stat +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-stat @@ -1,12 +1,11 @@ - (* OpenBSD 5.2 /usr/include/sys/stat.h *) + (* OpenBSD 5.4 /usr/include/sys/stat.h *) + st_mode*: mode_t; st_dev*: dev_t; st_ino*: ino_t; - st_mode*: mode_t; st_nlink*: nlink_t; st_uid*: uid_t; st_gid*: gid_t; st_rdev*: dev_t; - st_lspare0*: int32_t; st_atime*: time_t; st_atimensec*: long; @@ -20,8 +19,6 @@ st_blksize*: u_int32_t; st_flags*: u_int32_t; st_gen*: u_int32_t; - st_lspare1*: int32_t; __st_birthtime*: time_t; - __st_birthtimensec*: long; - st_qspare*: ARRAY [untagged] 2 OF int64_t; \ No newline at end of file + __st_birthtimensec*: long; \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-tm b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-tm index 5722e49..4c70ef6 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-tm +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-tm @@ -1,4 +1,4 @@ - (* OpenBSD 5.2 /usr/include/time.h *) + (* OpenBSD 5.4 /usr/include/time.h *) tm_sec*: int; (* seconds after the minute [0-60] *) tm_min*: int; (* minutes after the hour [0-59] *) tm_hour*: int; (* hours since midnight [0-23] *) diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-ucontext b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-ucontext index 754fed2..43b443d 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-ucontext +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/fields-ucontext @@ -1,4 +1,4 @@ - (* OpenBSD 5.2 /usr/include/i386/signal.h struct sigcontext *) + (* OpenBSD 5.4 /usr/include/i386/signal.h struct sigcontext *) sc_gs*: int; sc_fs*: int; sc_es*: int; @@ -17,14 +17,14 @@ sc_esp*: int; sc_ss*: int; - sc_onstack*: int; (* sigstack state to restore *) + __sc_unused: int; sc_mask*: int; (* signal mask to restore *) sc_trapno*: int; (* XXX should be above *) sc_err*: int; sc_fpstate*: RECORD [union] - (* OpenBSD 5.2 /usr/include/i386/npx.h union savefpu *) + (* OpenBSD 5.4 /usr/include/i386/npx.h union savefpu *) (* sv_87*: RECORD [untagged] ... diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/libver b/new/_OpenBSD_/Lin/Mod/gen-Libc/libver index fd509f3..3d9c28b 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/libver +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/libver @@ -1 +1 @@ -.66.0 \ No newline at end of file +.70.0 \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/osname b/new/_OpenBSD_/Lin/Mod/gen-Libc/osname index 98eb3c9..6811404 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Libc/osname +++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/osname @@ -1 +1 @@ -OpenBSD 5.2 \ No newline at end of file +OpenBSD 5.4 \ No newline at end of file diff --git a/new/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ b/new/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ index 0be10b6..29b9011 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ +++ b/new/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ @@ -1,9 +1,9 @@ -MODULE LinNet ["libc.so.66.0"]; +MODULE LinNet ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Mod/gen-Termios/Termios.txt.templ b/new/_OpenBSD_/Lin/Mod/gen-Termios/Termios.txt.templ index 81760c5..055af28 100644 --- a/new/_OpenBSD_/Lin/Mod/gen-Termios/Termios.txt.templ +++ b/new/_OpenBSD_/Lin/Mod/gen-Termios/Termios.txt.templ @@ -1,9 +1,9 @@ -MODULE LinTermios ["libc.so.66.0"]; +MODULE LinTermios ["libc.so.70.0"]; (* - A. V. Shiryaev, 2012.11 + A. V. Shiryaev, 2012.11, 2013.08 - OpenBSD 5.2 + OpenBSD 5.4 32-bit *) diff --git a/new/_OpenBSD_/Lin/Rsrc/loader/loader b/new/_OpenBSD_/Lin/Rsrc/loader/loader index 745fb08..bea6f87 100755 Binary files a/new/_OpenBSD_/Lin/Rsrc/loader/loader and b/new/_OpenBSD_/Lin/Rsrc/loader/loader differ diff --git a/new/_OpenBSD_/System/Mod/Kernel.odc b/new/_OpenBSD_/System/Mod/Kernel.odc index 8849353..9d12190 100644 Binary files a/new/_OpenBSD_/System/Mod/Kernel.odc and b/new/_OpenBSD_/System/Mod/Kernel.odc differ diff --git a/new/_OpenBSD_/libBB.so b/new/_OpenBSD_/libBB.so index 33298ef..b74b1f1 100644 Binary files a/new/_OpenBSD_/libBB.so and b/new/_OpenBSD_/libBB.so differ diff --git a/new/_OpenBSD_/libBB0.so b/new/_OpenBSD_/libBB0.so index 777e969..7455bd4 100644 Binary files a/new/_OpenBSD_/libBB0.so and b/new/_OpenBSD_/libBB0.so differ