From d765c35b197fd870efc88ed57842c425a9883fcc Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 6 Nov 2013 00:10:20 +0400 Subject: [PATCH] extTools fixed for non 64bit architectures, SysStat can now be compiled on 32bit architectures Former-commit-id: d9f6914fe5f3acabe685c920a233d5f1aaf37b66 --- hints | 3 ++- src/lib/ulm/armv6j/ulmSysStat.Mod | 12 ++++++------ src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod | 12 ++++++------ src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod | 12 ++++++------ src/lib/ulm/x86/ulmSysStat.Mod | 12 ++++++------ src/voc/gnuc/extTools.Mod | 4 +++- voc.REMOVED.git-id | 2 +- vocstatic.REMOVED.git-id | 2 +- vocstatic.linux.gnuc.x86_64.REMOVED.git-id | 2 +- 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/hints b/hints index 3779bad5..8d4d235d 100644 --- a/hints +++ b/hints @@ -2,7 +2,8 @@ 0) generate voc.par file for the target platform(if it's not exist in src/par). you can do it by compiling vocparam, and running it as "./vocparam > voc.par" 1) generate voc, ocat, showdef source for target platform by running - make port0 + make -f makefile.gnuc. port0 + (or copy corresponding voc.par to the source directory yourself, remove stage2 from port0 section of the makefile, and run make port0) 2) transfer source to a target platform and write make port1 (or use a crosscompiler) diff --git a/src/lib/ulm/armv6j/ulmSysStat.Mod b/src/lib/ulm/armv6j/ulmSysStat.Mod index d995779e..9154ba6d 100644 --- a/src/lib/ulm/armv6j/ulmSysStat.Mod +++ b/src/lib/ulm/armv6j/ulmSysStat.Mod @@ -39,7 +39,7 @@ MODULE ulmSysStat; (* examine inode: stat(2) and fstat(2) *) - IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, SysConversions := ulmSysConversions, SysError := ulmSysErrors, + IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, uSYS := ulmSYSTEM, SysConversions := ulmSysConversions, SysErrors := ulmSysErrors, SysTypes := ulmSysTypes; CONST @@ -156,7 +156,7 @@ MODULE ulmSysStat; d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN + IF uSYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE @@ -164,7 +164,7 @@ MODULE ulmSysStat; RETURN FALSE END; END Stat; - +(* PROCEDURE Lstat*(path: ARRAY OF CHAR; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR @@ -179,14 +179,14 @@ MODULE ulmSysStat; RETURN FALSE END; END Lstat; - +*) PROCEDURE Fstat*(fd: SysTypes.File; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR - d0, d1: INTEGER; + d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf)) THEN + IF uSYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE diff --git a/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod b/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod index d995779e..9154ba6d 100644 --- a/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod +++ b/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod @@ -39,7 +39,7 @@ MODULE ulmSysStat; (* examine inode: stat(2) and fstat(2) *) - IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, SysConversions := ulmSysConversions, SysError := ulmSysErrors, + IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, uSYS := ulmSYSTEM, SysConversions := ulmSysConversions, SysErrors := ulmSysErrors, SysTypes := ulmSysTypes; CONST @@ -156,7 +156,7 @@ MODULE ulmSysStat; d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN + IF uSYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE @@ -164,7 +164,7 @@ MODULE ulmSysStat; RETURN FALSE END; END Stat; - +(* PROCEDURE Lstat*(path: ARRAY OF CHAR; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR @@ -179,14 +179,14 @@ MODULE ulmSysStat; RETURN FALSE END; END Lstat; - +*) PROCEDURE Fstat*(fd: SysTypes.File; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR - d0, d1: INTEGER; + d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf)) THEN + IF uSYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE diff --git a/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod b/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod index d995779e..9154ba6d 100644 --- a/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod +++ b/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod @@ -39,7 +39,7 @@ MODULE ulmSysStat; (* examine inode: stat(2) and fstat(2) *) - IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, SysConversions := ulmSysConversions, SysError := ulmSysErrors, + IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, uSYS := ulmSYSTEM, SysConversions := ulmSysConversions, SysErrors := ulmSysErrors, SysTypes := ulmSysTypes; CONST @@ -156,7 +156,7 @@ MODULE ulmSysStat; d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN + IF uSYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE @@ -164,7 +164,7 @@ MODULE ulmSysStat; RETURN FALSE END; END Stat; - +(* PROCEDURE Lstat*(path: ARRAY OF CHAR; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR @@ -179,14 +179,14 @@ MODULE ulmSysStat; RETURN FALSE END; END Lstat; - +*) PROCEDURE Fstat*(fd: SysTypes.File; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR - d0, d1: INTEGER; + d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf)) THEN + IF uSYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE diff --git a/src/lib/ulm/x86/ulmSysStat.Mod b/src/lib/ulm/x86/ulmSysStat.Mod index d995779e..9154ba6d 100644 --- a/src/lib/ulm/x86/ulmSysStat.Mod +++ b/src/lib/ulm/x86/ulmSysStat.Mod @@ -39,7 +39,7 @@ MODULE ulmSysStat; (* examine inode: stat(2) and fstat(2) *) - IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, SysConversions := ulmSysConversions, SysError := ulmSysErrors, + IMPORT RelatedEvents := ulmRelatedEvents, Sys := ulmSys, SYS := SYSTEM, uSYS := ulmSYSTEM, SysConversions := ulmSysConversions, SysErrors := ulmSysErrors, SysTypes := ulmSysTypes; CONST @@ -156,7 +156,7 @@ MODULE ulmSysStat; d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN + IF uSYS.UNIXCALL(Sys.newstat, d0, d1, SYS.ADR(path), SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE @@ -164,7 +164,7 @@ MODULE ulmSysStat; RETURN FALSE END; END Stat; - +(* PROCEDURE Lstat*(path: ARRAY OF CHAR; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR @@ -179,14 +179,14 @@ MODULE ulmSysStat; RETURN FALSE END; END Lstat; - +*) PROCEDURE Fstat*(fd: SysTypes.File; VAR buf: StatRec; errors: RelatedEvents.Object) : BOOLEAN; VAR - d0, d1: INTEGER; + d0, d1, d2: LONGINT; origbuf: UnixStatRec; BEGIN - IF SYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf)) THEN + IF uSYS.UNIXCALL(Sys.newfstat, d0, d1, fd, SYS.ADR(origbuf), d2) THEN SysConversions.ByFmtFromC(origbuf, buf, statbuffmt); RETURN TRUE ELSE diff --git a/src/voc/gnuc/extTools.Mod b/src/voc/gnuc/extTools.Mod index b701bf70..6a9ae616 100644 --- a/src/voc/gnuc/extTools.Mod +++ b/src/voc/gnuc/extTools.Mod @@ -57,12 +57,14 @@ END LinkMain; BEGIN -incPath0 := "src/lib/system/gnuc/x86_64 "; +incPath0 := "src/lib/system/gnuc"; incPath1 := "lib/voc/obj "; ccOpt := " -fPIC -g -I "; COPY (version.prefix, tmp1); Strings.Append("/", tmp1); Strings.Append(incPath0, tmp1); +Strings.Append("/", tmp1); +Strings.Append(version.arch, tmp1); Strings.Append(" -I ", tmp1); Strings.Append(version.prefix, tmp1); Strings.Append("/", tmp1); diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id index 349cb107..7ee40301 100644 --- a/voc.REMOVED.git-id +++ b/voc.REMOVED.git-id @@ -1 +1 @@ -3c118e5bfc1787c62523a8bb8274faa74779587b \ No newline at end of file +bbe6d27c2b427336227ff2a9bf5db1ff160c9184 \ No newline at end of file diff --git a/vocstatic.REMOVED.git-id b/vocstatic.REMOVED.git-id index 349cb107..7ee40301 100644 --- a/vocstatic.REMOVED.git-id +++ b/vocstatic.REMOVED.git-id @@ -1 +1 @@ -3c118e5bfc1787c62523a8bb8274faa74779587b \ No newline at end of file +bbe6d27c2b427336227ff2a9bf5db1ff160c9184 \ No newline at end of file diff --git a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id b/vocstatic.linux.gnuc.x86_64.REMOVED.git-id index 349cb107..7ee40301 100644 --- a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id +++ b/vocstatic.linux.gnuc.x86_64.REMOVED.git-id @@ -1 +1 @@ -3c118e5bfc1787c62523a8bb8274faa74779587b \ No newline at end of file +bbe6d27c2b427336227ff2a9bf5db1ff160c9184 \ No newline at end of file