From 40d40a651ef8d9cd150503fc264b1c922f63fe61 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 9 Nov 2023 13:40:55 +0900
Subject: [PATCH] Revert "Disable iseq-dumped builtin module for universal
 x86_64/arm64 binaries"

This reverts commit 1d5598fe0d3470e7cab06a756d40a9221fcd501b.
---
 builtin.c                        | 2 +-
 common.mk                        | 2 +-
 configure.ac                     | 2 --
 template/Makefile.in             | 1 -
 template/builtin_binary.inc.tmpl | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/builtin.c b/builtin.c
index ba412dddbc..aef5b2c2d4 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,7 +3,7 @@
 #include "iseq.h"
 #include "builtin.h"
 
-#if defined(CROSS_COMPILING) || defined(UNIVERSAL_BINARY)
+#ifdef CROSS_COMPILING
 
 #define INCLUDED_BY_BUILTIN_C 1
 #include "mini_builtin.c"
diff --git a/common.mk b/common.mk
index 15226654dd..2732a1ea4a 100644
--- a/common.mk
+++ b/common.mk
@@ -1303,7 +1303,7 @@ preludes: {$(srcdir)}golf_prelude.c
 
 builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl
 	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ \
-		$(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING) --universal=$(UNIVERSAL_BINARY)
+		$(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING)
 
 $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
 
diff --git a/configure.ac b/configure.ac
index 2ac47609fd..bf6d9af1f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4367,8 +4367,6 @@ AS_IF([test "${universal_binary-no}" = yes ], [
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
     AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-" RUBY_PLATFORM_OS)
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
-    AC_DEFINE(UNIVERSAL_BINARY, 1)
-    AC_SUBST(UNIVERSAL_BINARY, yes)
 ], [
     AS_IF([test "${target_os}-${rb_cv_msvcrt}" = "mingw32-ucrt" ], [
         arch="${target_cpu}-mingw-ucrt"
diff --git a/template/Makefile.in b/template/Makefile.in
index e06834e4ca..93fa02d9d7 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -65,7 +65,6 @@ rubyarchhdrdir = @rubyarchhdrdir@
 ruby_version = @ruby_version@
 RUBY_VERSION_NAME = @RUBY_VERSION_NAME@
 UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@
-UNIVERSAL_BINARY = @UNIVERSAL_BINARY@
 
 TESTUI = console
 TESTS =
diff --git a/template/builtin_binary.inc.tmpl b/template/builtin_binary.inc.tmpl
index 86ea34970b..2c2f071705 100644
--- a/template/builtin_binary.inc.tmpl
+++ b/template/builtin_binary.inc.tmpl
@@ -2,7 +2,7 @@
 // DO NOT MODIFY THIS FILE DIRECTLY.
 // auto-generated file by tool/generic_erb.rb
 // with template/builtin_binary.inc.tmpl
-% unless ARGV.include?('--cross=yes') || ARGV.include?('--universal=yes')
+% unless ARGV.include?('--cross=yes')
 %   ary = RubyVM.enum_for(:each_builtin).to_a
 %   ary.each{|feature, iseq|