diff -r cbd7407d4f48 -r 9192ece79ae1 ObjectFileLoader.st --- a/ObjectFileLoader.st Fri Jun 03 14:53:54 2016 +0200 +++ b/ObjectFileLoader.st Fri Jun 03 15:23:11 2016 +0200 @@ -1,3 +1,5 @@ +"{ Encoding: utf8 }" + " COPYRIGHT (c) 1993 by Claus Gittinger All Rights Reserved @@ -1593,26 +1595,26 @@ initAddr notNil ifTrue:[^ initAddr]. (functionName startsWith:'lib') ifTrue:[ - className := functionName + className := functionName ] ifFalse:[ - " - look for reverse abbreviation - slow, because abbrevs are recursively read - " - className := Smalltalk classNameForFile:functionName. + " + look for reverse abbreviation - slow, because abbrevs are recursively read + " + className := functionName. "/ Smalltalk classNameForFile:functionName. ]. className notNil ifTrue:[ - initAddr := self getFunction:(className , suffix) from:handle. - initAddr notNil ifTrue:[^ initAddr]. - - initAddr := self getFunction:('_' , className , suffix) from:handle. - initAddr isNil ifTrue:[ - "/ - "/ special for broken ultrix nlist - "/ (will not find symbol with single underscore) - "/ workaround: add another underscore and retry - "/ - initAddr := self getFunction:('__' , className , suffix) from:handle. - ]. + initAddr := self getFunction:(className , suffix) from:handle. + initAddr notNil ifTrue:[^ initAddr]. + + initAddr := self getFunction:('_' , className , suffix) from:handle. + initAddr isNil ifTrue:[ + "/ + "/ special for broken ultrix nlist + "/ (will not find symbol with single underscore) + "/ workaround: add another underscore and retry + "/ + initAddr := self getFunction:('__' , className , suffix) from:handle. + ]. ]. ^ initAddr