Skip to content

Commit c2724f0

Browse files
committed
[GR-17110] Remove the Solaris native configuration.
PullRequest: truffleruby/947
2 parents 9c85a7f + 3308cfd commit c2724f0

File tree

8 files changed

+11
-785
lines changed

8 files changed

+11
-785
lines changed

src/main/java/org/truffleruby/RubyContext.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
import org.truffleruby.platform.Platform;
7272
import org.truffleruby.platform.NativeConfiguration;
7373
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;
7776
import org.truffleruby.shared.TruffleRuby;
7877
import org.truffleruby.shared.options.RubyOptionTypes;
7978
import org.truffleruby.stdlib.CoverageManager;
@@ -413,9 +412,6 @@ private NativeConfiguration loadNativeConfiguration() {
413412
case DARWIN:
414413
DarwinNativeConfiguration.load(nativeConfiguration, this);
415414
break;
416-
case SOLARIS:
417-
SolarisSparcV9NativeConfiguration.load(nativeConfiguration, this);
418-
break;
419415
default:
420416
RubyLanguage.LOGGER.severe("no native configuration for this platform");
421417
break;

src/main/java/org/truffleruby/parser/BodyTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@
253253
import org.truffleruby.parser.parser.ParseNodeTuple;
254254
import org.truffleruby.parser.parser.ParserSupport;
255255
import org.truffleruby.parser.scope.StaticScope;
256-
import org.truffleruby.platform.graal.AssertConstantNodeGen;
257-
import org.truffleruby.platform.graal.AssertNotCompiledNodeGen;
258256

259257
import com.oracle.truffle.api.RootCallTarget;
260258
import com.oracle.truffle.api.Truffle;
@@ -264,6 +262,8 @@
264262
import com.oracle.truffle.api.object.DynamicObject;
265263
import com.oracle.truffle.api.source.Source;
266264
import com.oracle.truffle.api.source.SourceSection;
265+
import org.truffleruby.platform.AssertConstantNodeGen;
266+
import org.truffleruby.platform.AssertNotCompiledNodeGen;
267267

268268
/**
269269
* A JRuby parser node visitor which translates JRuby AST nodes into truffle Nodes.

src/main/java/org/truffleruby/platform/graal/AssertConstantNode.java renamed to src/main/java/org/truffleruby/platform/AssertConstantNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* GNU General Public License version 2, or
88
* GNU Lesser General Public License version 2.1.
99
*/
10-
package org.truffleruby.platform.graal;
10+
package org.truffleruby.platform;
1111

1212
import com.oracle.truffle.api.CompilerDirectives;
1313
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

src/main/java/org/truffleruby/platform/graal/AssertNotCompiledNode.java renamed to src/main/java/org/truffleruby/platform/AssertNotCompiledNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* GNU General Public License version 2, or
88
* GNU Lesser General Public License version 2.1.
99
*/
10-
package org.truffleruby.platform.graal;
10+
package org.truffleruby.platform;
1111

1212
import com.oracle.truffle.api.CompilerDirectives;
1313
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

src/main/java/org/truffleruby/platform/darwin/DarwinNativeConfiguration.java renamed to src/main/java/org/truffleruby/platform/DarwinNativeConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3636
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
*/
38-
package org.truffleruby.platform.darwin;
38+
package org.truffleruby.platform;
3939

4040
import org.truffleruby.RubyContext;
41-
import org.truffleruby.platform.DefaultNativeConfiguration;
42-
import org.truffleruby.platform.NativeConfiguration;
4341

4442
public class DarwinNativeConfiguration extends DefaultNativeConfiguration {
4543

src/main/java/org/truffleruby/platform/linux/LinuxNativeConfiguration.java renamed to src/main/java/org/truffleruby/platform/LinuxNativeConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3636
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
*/
38-
package org.truffleruby.platform.linux;
38+
package org.truffleruby.platform;
3939

4040
import org.truffleruby.RubyContext;
41-
import org.truffleruby.platform.DefaultNativeConfiguration;
42-
import org.truffleruby.platform.NativeConfiguration;
4341

4442
public class LinuxNativeConfiguration extends DefaultNativeConfiguration {
4543

src/main/java/org/truffleruby/platform/solaris/SolarisSparcV9NativeConfiguration.java

Lines changed: 0 additions & 759 deletions
This file was deleted.

tool/generate-native-config.rb

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,12 @@
4343

4444
case RUBY_PLATFORM
4545
when /x86_64-linux/
46-
PLATFORM_FILE = 'org/truffleruby/platform/linux/LinuxNativeConfiguration.java'
46+
PLATFORM_FILE = 'org/truffleruby/platform/LinuxNativeConfiguration.java'
4747
EXTRA_CFLAGS << ' -D_GNU_SOURCE'
4848
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'
5750
else
58-
raise "Unknown platform #{RUBY_PLATFORM}"
51+
raise "Unsupported platform #{RUBY_PLATFORM}"
5952
end
6053

6154
class ConfigFileHandler

0 commit comments

Comments
 (0)