Jelajahi Sumber

updated for OpenBSD 5.8

Alexander Shiryaev 9 tahun lalu
induk
melakukan
da1d8d6be5

+ 3 - 3
BlackBox/_OpenBSD_/Lin/Mod/Ioctl.txt

@@ -1,9 +1,9 @@
-MODULE LinIoctl ["libc.so.78.0"];
+MODULE LinIoctl ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 

+ 15 - 13
BlackBox/_OpenBSD_/Lin/Mod/Libc.txt

@@ -1,7 +1,7 @@
-MODULE LinLibc ["libc.so.78.0"];
+MODULE LinLibc ["libc.so.81.0"];
 
 	(*
-		OpenBSD 5.6
+		OpenBSD 5.8
 		i386
 	*)
 
@@ -389,6 +389,8 @@ MODULE LinLibc ["libc.so.78.0"];
 		dev_t* = INTEGER;
 		ino_t* = LONGINT;
 		nlink_t* = INTEGER;
+		blkcnt_t = LONGINT;
+		blksize_t = INTEGER;
 		int8_t* = SHORTCHAR;
 		u_int8_t* = SHORTCHAR;
 		int16_t* = SHORTINT;
@@ -408,7 +410,7 @@ MODULE LinLibc ["libc.so.78.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.4 /usr/include/time.h *)
+			(* OpenBSD 5.8 /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] *)
@@ -425,7 +427,7 @@ MODULE LinLibc ["libc.so.78.0"];
 		Ptrsiginfo_t* = POINTER TO siginfo_t;
 		siginfo_t = RECORD [untagged]
 			(* si_code, fault address *)
-			(* OpenBSD 5.4 /usr/include/sys/siginfo.h *)
+			(* OpenBSD 5.8 /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 *)
@@ -458,7 +460,7 @@ MODULE LinLibc ["libc.so.78.0"];
 		Ptrucontext_t* = POINTER TO ucontext_t;
 		ucontext_t = RECORD [untagged]
 			(* IP, SP, FP *)
-			(* OpenBSD 5.4 /usr/include/i386/signal.h struct sigcontext *)
+			(* OpenBSD 5.8 /usr/include/i386/signal.h struct sigcontext *)
 				sc_gs*: int;
 				sc_fs*: int;
 				sc_es*: int;
@@ -501,7 +503,7 @@ MODULE LinLibc ["libc.so.78.0"];
 			sa_sigaction*: PROCEDURE [ccall] (sig: INTEGER; siginfo: Ptrsiginfo_t; context: Ptrucontext_t),
 			sa_flags*: intFlags, sa_mask*: sigset_t
 *)
-			(* OpenBSD 5.4 /usr/include/sys/signal.h *)
+			(* OpenBSD 5.8 /usr/include/sys/signal.h *)
 				sa_sigaction*: PROCEDURE [ccall] (sig: int; siginfo: Ptrsiginfo_t; ctx: Ptrucontext_t);
 				sa_mask*: sigset_t;
 				sa_flags*: intFlags;
@@ -511,7 +513,7 @@ MODULE LinLibc ["libc.so.78.0"];
 (*
 			ss_sp*: PtrVoid, ss_size*: size_t, ss_flags*: intFlags
 *)
-			(* OpenBSD 5.4 /usr/include/sys/signal.h *)
+			(* OpenBSD 5.8 /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 *)
@@ -522,7 +524,7 @@ MODULE LinLibc ["libc.so.78.0"];
 			NOTE: check record size
 			st_mode*: mode_t, st_size*: off_t, st_mtime*: time_t
 *)
-			(* OpenBSD 5.4 /usr/include/sys/stat.h *)
+			(* OpenBSD 5.8 /usr/include/sys/stat.h *)
 				st_mode*: mode_t;
 				st_dev*: dev_t;
 				st_ino*: ino_t;
@@ -539,8 +541,8 @@ MODULE LinLibc ["libc.so.78.0"];
 				st_ctimensec*: long;
 
 				st_size*: off_t;
-				st_blocks*: int64_t;
-				st_blksize*: u_int32_t;
+				st_blocks*: blkcnt_t;
+				st_blksize*: blksize_t;
 				st_flags*: u_int32_t;
 				st_gen*: u_int32_t;
 
@@ -556,7 +558,7 @@ MODULE LinLibc ["libc.so.78.0"];
 (*
 			d_name*: ARRAY [untagged] NAME_MAX + 1 OF SHORTCHAR
 *)
-			(* OpenBSD 5.4 /usr/include/sys/dirent.h *)
+			(* OpenBSD 5.8 /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 *)
@@ -567,7 +569,7 @@ MODULE LinLibc ["libc.so.78.0"];
 		END;
 
 		timespec_t* = RECORD [untagged]
-			(* OpenBSD 5.4 /usr/include/time.h *)
+			(* OpenBSD 5.8 /usr/include/time.h *)
 				tv_sec*: time_t; (* seconds *)
 				tv_nsec*: long; (* and nanoseconds *)
 		END;
@@ -586,7 +588,7 @@ MODULE LinLibc ["libc.so.78.0"];
 *)
 	VAR
 		(* OpenBSD: stdin, stdout, stderr *)
-			__sF*: ARRAY [untagged] 3 OF FILE; (* OpenBSD 5.2 /usr/include/stdio.h *)
+			__sF*: ARRAY [untagged] 3 OF FILE; (* OpenBSD 5.8 /usr/include/stdio.h *)
 				(*
 					stdin = SYSTEM.ADR(__sF[0])
 					stdout = SYSTEM.ADR(__sF[1])

+ 7 - 5
BlackBox/_OpenBSD_/Lin/Mod/Net.txt

@@ -1,9 +1,9 @@
-MODULE LinNet ["libc.so.78.0"];
+MODULE LinNet ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 
@@ -168,6 +168,8 @@ MODULE LinNet ["libc.so.78.0"];
 			sa_family_t* = SHORTCHAR;
 			in_addr_t* = INTEGER;
 			in_port_t* = SHORTINT;
+			time_t = LONGINT;
+			suseconds_t = INTEGER;
 
 		(* /usr/include/sys/socket.h *)
 			sockaddr* = RECORD [untagged]
@@ -225,8 +227,8 @@ MODULE LinNet ["libc.so.78.0"];
 
 		(* /usr/include/sys/time.h *)
 			timeval* = RECORD [untagged]
-				tv_sec*: INTEGER; (* seconds *)
-				tv_usec*: INTEGER; (* and microseconds *)
+				tv_sec*: time_t; (* seconds *)
+				tv_usec*: suseconds_t; (* and microseconds *)
 			END;
 
 		(* /usr/include/sys/select.h *)

+ 3 - 3
BlackBox/_OpenBSD_/Lin/Mod/Termios.txt

@@ -1,9 +1,9 @@
-MODULE LinTermios ["libc.so.78.0"];
+MODULE LinTermios ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 

+ 3 - 3
BlackBox/_OpenBSD_/Lin/Mod/gen-Ioctl/Ioctl.txt.templ

@@ -1,9 +1,9 @@
-MODULE LinIoctl ["libc.so.78.0"];
+MODULE LinIoctl ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/custom

@@ -1,6 +1,6 @@
 	VAR
 		(* OpenBSD: stdin, stdout, stderr *)
-			__sF*: ARRAY [untagged] 3 OF FILE; (* OpenBSD 5.2 /usr/include/stdio.h *)
+			__sF*: ARRAY [untagged] 3 OF FILE; (* OpenBSD 5.8 /usr/include/stdio.h *)
 				(*
 					stdin = SYSTEM.ADR(__sF[0])
 					stdout = SYSTEM.ADR(__sF[1])

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-dirent

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/sys/dirent.h *)
+			(* OpenBSD 5.8 /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 *)

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-sigaction

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/sys/signal.h *)
+			(* OpenBSD 5.8 /usr/include/sys/signal.h *)
 				sa_sigaction*: PROCEDURE [ccall] (sig: int; siginfo: Ptrsiginfo_t; ctx: Ptrucontext_t);
 				sa_mask*: sigset_t;
 				sa_flags*: intFlags;

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-siginfo

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/sys/siginfo.h *)
+			(* OpenBSD 5.8 /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 *)

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-stack

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/sys/signal.h *)
+			(* OpenBSD 5.8 /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 *)

+ 3 - 3
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-stat

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/sys/stat.h *)
+			(* OpenBSD 5.8 /usr/include/sys/stat.h *)
 				st_mode*: mode_t;
 				st_dev*: dev_t;
 				st_ino*: ino_t;
@@ -15,8 +15,8 @@
 				st_ctimensec*: long;
 
 				st_size*: off_t;
-				st_blocks*: int64_t;
-				st_blksize*: u_int32_t;
+				st_blocks*: blkcnt_t;
+				st_blksize*: blksize_t;
 				st_flags*: u_int32_t;
 				st_gen*: u_int32_t;
 

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-timespec

@@ -1,3 +1,3 @@
-			(* OpenBSD 5.4 /usr/include/time.h *)
+			(* OpenBSD 5.8 /usr/include/time.h *)
 				tv_sec*: time_t; (* seconds *)
 				tv_nsec*: long; (* and nanoseconds *)

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-tm

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/time.h *)
+			(* OpenBSD 5.8 /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] *)

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/fields-ucontext

@@ -1,4 +1,4 @@
-			(* OpenBSD 5.4 /usr/include/i386/signal.h struct sigcontext *)
+			(* OpenBSD 5.8 /usr/include/i386/signal.h struct sigcontext *)
 				sc_gs*: int;
 				sc_fs*: int;
 				sc_es*: int;

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/libver

@@ -1 +1 @@
-.78.0
+.81.0

+ 1 - 1
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/osname

@@ -1 +1 @@
-OpenBSD 5.6
+OpenBSD 5.8

+ 2 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Libc/sizeofs.c

@@ -69,6 +69,8 @@ int main ()
 	D("dev_t", sizeof(dev_t), FALSE, TRUE);
 	D("ino_t", sizeof(ino_t), FALSE, TRUE);
 	D("nlink_t", sizeof(nlink_t), FALSE, TRUE);
+	D("blkcnt_t", sizeof(blkcnt_t), FALSE, FALSE);
+	D("blksize_t", sizeof(blksize_t), FALSE, FALSE);
 	D("int8_t", sizeof(int8_t), FALSE, TRUE);
 	D("u_int8_t", sizeof(u_int8_t), FALSE, TRUE);
 	D("int16_t", sizeof(int16_t), FALSE, TRUE);

+ 7 - 5
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ

@@ -1,9 +1,9 @@
-MODULE LinNet ["libc.so.78.0"];
+MODULE LinNet ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 
@@ -35,6 +35,8 @@ MODULE LinNet ["libc.so.78.0"];
 			sa_family_t* = SHORTCHAR;
 			in_addr_t* = INTEGER;
 			in_port_t* = SHORTINT;
+			time_t = LONGINT;
+			suseconds_t = INTEGER;
 
 		(* /usr/include/sys/socket.h *)
 			sockaddr* = RECORD [untagged]
@@ -92,8 +94,8 @@ MODULE LinNet ["libc.so.78.0"];
 
 		(* /usr/include/sys/time.h *)
 			timeval* = RECORD [untagged]
-				tv_sec*: INTEGER; (* seconds *)
-				tv_usec*: INTEGER; (* and microseconds *)
+				tv_sec*: time_t; (* seconds *)
+				tv_usec*: suseconds_t; (* and microseconds *)
 			END;
 
 		(* /usr/include/sys/select.h *)

+ 3 - 3
BlackBox/_OpenBSD_/Lin/Mod/gen-Termios/Termios.txt.templ

@@ -1,9 +1,9 @@
-MODULE LinTermios ["libc.so.78.0"];
+MODULE LinTermios ["libc.so.81.0"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
 
-		OpenBSD 5.6
+		OpenBSD 5.8
 		32-bit
 	*)
 

TEMPAT SAMPAH
BlackBox/_OpenBSD_/libBB.so


TEMPAT SAMPAH
BlackBox/_OpenBSD_/libBB0.so


+ 2 - 2
README

@@ -2,7 +2,7 @@ Oberon Microsystems BlackBox Component Builder (http://www.oberon.ch/)
 Port for OpenBSD/i386, GNU/Linux/i386, FreeBSD/i386
 
 Tested on:
-	OpenBSD 5.6
+	OpenBSD 5.8
 	Fedora Core 17
 	Ubuntu 12.04 LTS, 12.10, 13.10, 14.04
 	FreeBSD 9.0 (non-GUI part only)
@@ -202,4 +202,4 @@ Notes:
 			BB_SECONDARY_DIR (was: /USE command line option)
 			BB_PACKED_NAME
 
-Alexander V. Shiryaev, 2014
+Alexander V. Shiryaev, 2015

+ 2 - 2
README.md

@@ -3,7 +3,7 @@
 Port for OpenBSD/i386, GNU/Linux/i386, FreeBSD/i386
 
 Tested on:
-* OpenBSD 5.6
+* OpenBSD 5.8
 * Fedora Core 17
 * Ubuntu 12.04 LTS, 12.10, 13.10, 14.04
 * FreeBSD 9.0 (non-GUI part only)
@@ -40,4 +40,4 @@ How to run (after build):
 	cd BlackBox
 	./run-BlackBox
 
-Alexander V. Shiryaev, 2014
+Alexander V. Shiryaev, 2015