File tree Expand file tree Collapse file tree 8 files changed +11
-785
lines changed
src/main/java/org/truffleruby Expand file tree Collapse file tree 8 files changed +11
-785
lines changed Original file line number Diff line number Diff line change 71
71
import org .truffleruby .platform .Platform ;
72
72
import org .truffleruby .platform .NativeConfiguration ;
73
73
import org .truffleruby .platform .TruffleNFIPlatform ;
74
- import org .truffleruby .platform .darwin .DarwinNativeConfiguration ;
75
- import org .truffleruby .platform .linux .LinuxNativeConfiguration ;
76
- import org .truffleruby .platform .solaris .SolarisSparcV9NativeConfiguration ;
74
+ import org .truffleruby .platform .DarwinNativeConfiguration ;
75
+ import org .truffleruby .platform .LinuxNativeConfiguration ;
77
76
import org .truffleruby .shared .TruffleRuby ;
78
77
import org .truffleruby .shared .options .RubyOptionTypes ;
79
78
import org .truffleruby .stdlib .CoverageManager ;
@@ -413,9 +412,6 @@ private NativeConfiguration loadNativeConfiguration() {
413
412
case DARWIN :
414
413
DarwinNativeConfiguration .load (nativeConfiguration , this );
415
414
break ;
416
- case SOLARIS :
417
- SolarisSparcV9NativeConfiguration .load (nativeConfiguration , this );
418
- break ;
419
415
default :
420
416
RubyLanguage .LOGGER .severe ("no native configuration for this platform" );
421
417
break ;
Original file line number Diff line number Diff line change 253
253
import org .truffleruby .parser .parser .ParseNodeTuple ;
254
254
import org .truffleruby .parser .parser .ParserSupport ;
255
255
import org .truffleruby .parser .scope .StaticScope ;
256
- import org .truffleruby .platform .graal .AssertConstantNodeGen ;
257
- import org .truffleruby .platform .graal .AssertNotCompiledNodeGen ;
258
256
259
257
import com .oracle .truffle .api .RootCallTarget ;
260
258
import com .oracle .truffle .api .Truffle ;
264
262
import com .oracle .truffle .api .object .DynamicObject ;
265
263
import com .oracle .truffle .api .source .Source ;
266
264
import com .oracle .truffle .api .source .SourceSection ;
265
+ import org .truffleruby .platform .AssertConstantNodeGen ;
266
+ import org .truffleruby .platform .AssertNotCompiledNodeGen ;
267
267
268
268
/**
269
269
* A JRuby parser node visitor which translates JRuby AST nodes into truffle Nodes.
Original file line number Diff line number Diff line change 7
7
* GNU General Public License version 2, or
8
8
* GNU Lesser General Public License version 2.1.
9
9
*/
10
- package org .truffleruby .platform . graal ;
10
+ package org .truffleruby .platform ;
11
11
12
12
import com .oracle .truffle .api .CompilerDirectives ;
13
13
import com .oracle .truffle .api .CompilerDirectives .TruffleBoundary ;
Original file line number Diff line number Diff line change 7
7
* GNU General Public License version 2, or
8
8
* GNU Lesser General Public License version 2.1.
9
9
*/
10
- package org .truffleruby .platform . graal ;
10
+ package org .truffleruby .platform ;
11
11
12
12
import com .oracle .truffle .api .CompilerDirectives ;
13
13
import com .oracle .truffle .api .CompilerDirectives .TruffleBoundary ;
Original file line number Diff line number Diff line change 35
35
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
36
36
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37
37
*/
38
- package org .truffleruby .platform . darwin ;
38
+ package org .truffleruby .platform ;
39
39
40
40
import org .truffleruby .RubyContext ;
41
- import org .truffleruby .platform .DefaultNativeConfiguration ;
42
- import org .truffleruby .platform .NativeConfiguration ;
43
41
44
42
public class DarwinNativeConfiguration extends DefaultNativeConfiguration {
45
43
Original file line number Diff line number Diff line change 35
35
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
36
36
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37
37
*/
38
- package org .truffleruby .platform . linux ;
38
+ package org .truffleruby .platform ;
39
39
40
40
import org .truffleruby .RubyContext ;
41
- import org .truffleruby .platform .DefaultNativeConfiguration ;
42
- import org .truffleruby .platform .NativeConfiguration ;
43
41
44
42
public class LinuxNativeConfiguration extends DefaultNativeConfiguration {
45
43
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 43
43
44
44
case RUBY_PLATFORM
45
45
when /x86_64-linux/
46
- PLATFORM_FILE = 'org/truffleruby/platform/linux/ LinuxNativeConfiguration.java'
46
+ PLATFORM_FILE = 'org/truffleruby/platform/LinuxNativeConfiguration.java'
47
47
EXTRA_CFLAGS << ' -D_GNU_SOURCE'
48
48
when /x86_64-darwin/
49
- PLATFORM_FILE = 'org/truffleruby/platform/darwin/DarwinNativeConfiguration.java'
50
- when /sparc(?:v9)?-solaris/
51
- PLATFORM_FILE = 'org/truffleruby/platform/solaris/SolarisSparcV9NativeConfiguration.java'
52
- ENV [ 'CC' ] ||= 'gcc'
53
- # "-m64" forces a 64-bit binary
54
- # "-D_XOPEN_SOURCE=600" tells Solaris to use the SUSv3 feature set
55
- # "-std=gnu99" is required to build with SUSv3 enabled
56
- EXTRA_CFLAGS << ' -std=gnu99 -m64 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1'
49
+ PLATFORM_FILE = 'org/truffleruby/platform/DarwinNativeConfiguration.java'
57
50
else
58
- raise "Unknown platform #{ RUBY_PLATFORM } "
51
+ raise "Unsupported platform #{ RUBY_PLATFORM } "
59
52
end
60
53
61
54
class ConfigFileHandler
You can’t perform that action at this time.
0 commit comments