Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix initialization of system propertirs
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 04 Feb 2019 00:24:10 +0000
changeset 3886 292b73957757
parent 3885 81a09bfe1d39
child 3906 2071e571f428
child 3914 35aa88fa58c1
Fix initialization of system propertirs ...and use `amd64` consistenly instead of `x86_64`.
JavaVM.st file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
experiments/bc.mak file | annotate | diff | comparison | revisions
tools/bc.mak file | annotate | diff | comparison | revisions 
--- a/JavaVM.st	Sun Feb 03 23:47:29 2019 +0000
+++ b/JavaVM.st	Mon Feb 04 00:24:10 2019 +0000
@@ -1809,9 +1809,10 @@
     cpu := OperatingSystem getCPUType.
     cpu2 := cpu.
     cpu = 'i386' ifTrue: [ cpu := 'ix86' ].
-    (OperatingSystem getSystemInfo at: #machine) = 'x86_64' ifTrue: [
-        cpu2 := 'amd64'
-    ].
+    cpu = 'x86'  ifTrue: [ cpu := 'ix86' ].    
+    cpu = 'ix86' ifTrue: [ cpu2 := 'amd64' ].                
+    cpu = 'x86_64' ifTrue: [cpu2 := 'amd64' ].
+
     SimulatedOS notNil ifTrue: [ os := SimulatedOS ] ifFalse: [
         os := OperatingSystem getOSType.
         os := os asUppercaseFirst.
@@ -1973,9 +1974,9 @@
     "Created: / 03-01-1998 / 14:26:39 / cg"
     "Modified: / 27-01-2000 / 02:20:18 / cg"
     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 21-12-2011 / 23:05:11 / jv"
     "Modified: / 13-09-2012 / 20:33:56 / m"
     "Modified: / 20-11-2013 / 23:43:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-02-2019 / 00:16:12 / jv"
 !
 
 initializeVM
--- a/bc.mak	Sun Feb 03 23:47:29 2019 +0000
+++ b/bc.mak	Mon Feb 04 00:24:10 2019 +0000
@@ -33,11 +33,11 @@
 MODULE_PATH=libjava
 RESFILES=stx_libjavaWINrc.$(RES)
 
-    
+
 !if defined(USEMINGW32) || defined(USEMINGW64)
 ! if defined(USEMINGW32)
 LIBFDM_TARGET = i686-pc-mingw32
-! else 
+! else
 LIBFDM_TARGET = x86_64-w64-mingw32
 ! endif
 LIBFDM=support\fdlibm\$(LIBFDM_TARGET)\libfdm.a
@@ -116,12 +116,13 @@
 $(LIBFDM):
     set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm
 ! endif
-!endif         
+!endif
 
 
 
 
-test: $(TOP)\goodies\builder\reports\NUL
+
+test: $(TOP)\goodies\builder\reports
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
--- a/experiments/bc.mak	Sun Feb 03 23:47:29 2019 +0000
+++ b/experiments/bc.mak	Mon Feb 04 00:24:10 2019 +0000
@@ -75,7 +75,8 @@
 
 
 
-test: $(TOP)\goodies\builder\reports\NUL
+
+test: $(TOP)\goodies\builder\reports
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
--- a/tools/bc.mak	Sun Feb 03 23:47:29 2019 +0000
+++ b/tools/bc.mak	Mon Feb 04 00:24:10 2019 +0000
@@ -82,7 +82,7 @@
 
 
 
-test: $(TOP)\goodies\builder\reports\NUL
+test: $(TOP)\goodies\builder\reports
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
hg/stx-libjava