ObjectFileLoader.st
changeset 2156 2cb69ec50829
parent 2154 9cc9a982e2ca
child 2184 5740ebfeba2c
--- a/ObjectFileLoader.st	Fri Feb 13 09:37:34 2009 +0100
+++ b/ObjectFileLoader.st	Fri Feb 13 10:22:46 2009 +0100
@@ -701,24 +701,25 @@
     |os|
 
     OperatingSystem isMSDOSlike ifTrue:[
-	"/ includes all of win32s, win95, winNT & os/2
-	^ #('dll')
+        "/ includes all of win32s, win95, winNT & os/2
+        ^ #('dll')
     ].
     OperatingSystem isVMSlike ifTrue:[
-	^ #('exe')
+        ^ #('exe')
     ].
 
     os := OperatingSystem getSystemType.
+    (os = 'solaris') ifTrue:[^ #('so') ].
+    (os = 'linux') ifTrue:[
+        self loadableBinaryObjectFormat == #aout ifTrue:[
+            ^ #('o' 'obj' 'a')
+        ].
+        ^ #('so')
+    ].
+    (os = 'hpux') ifTrue:[^ #('sl') ].
     (os = 'sunos') ifTrue:[^ #('o' 'obj' 'a') ].
     (os = 'ultrix') ifTrue:[^ #('o' 'obj' 'ld' 'obj.ld') ].
-    (os = 'linux') ifTrue:[
-	self loadableBinaryObjectFormat == #aout ifTrue:[
-	    ^ #('o' 'obj' 'a')
-	].
-	^ #('so' 'o' 'obj' )
-    ].
-    (os = 'aix') ifTrue:[^ #('so' 'o') ].
-    (os = 'hpux') ifTrue:[^ #('sl') ].
+    (os = 'aix') ifTrue:[^ #('so') ].
 
     "/ mhmh what is a useful default ?
 
@@ -4090,7 +4091,7 @@
 !ObjectFileLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.271 2009-02-12 13:33:28 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.272 2009-02-13 09:22:46 stefan Exp $'
 ! !
 
 ObjectFileLoader initialize!