diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2023-03-06 21:41:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 21:41:48 -0800 |
| commit | 31f4b2d86bfbc753cec9be376719acc4b120e944 (patch) | |
| tree | 4f56cd8760e920283d877abea30b16cb38c09c60 /template | |
| parent | 09b4236f17dfad945e85edb5c57ab4cd81065915 (diff) | |
| download | ruby-31f4b2d86bfbc753cec9be376719acc4b120e944.tar.gz | |
Drop obsoleted MJIT header (#7458)
RJIT doesn't need this.
Diffstat (limited to 'template')
| -rw-r--r-- | template/GNUmakefile.in | 1 | ||||
| -rw-r--r-- | template/Makefile.in | 28 |
2 files changed, 2 insertions, 27 deletions
diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index 4db4467905..0c7f4e9dd0 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -27,7 +27,6 @@ override UNICODE_TABLES_DEPENDENTS = \ $(UNICODE_TABLES_DATA_FILES)))),\ force,none) -include $(srcdir)/defs/universal.mk -include uncommon.mk include $(srcdir)/defs/gmake.mk diff --git a/template/Makefile.in b/template/Makefile.in index 71b68edbeb..0dd30ca7d1 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -96,20 +96,12 @@ USE_RUBYGEMS = @USE_RUBYGEMS@ USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=) CPPFLAGS = @CPPFLAGS@ $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1) MJIT_SUPPORT = @MJIT_SUPPORT@ -MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@ -MJIT_HEADER_SUFFIX = -MJIT_HEADER_ARCH = -MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@ MJIT_CC = @MJIT_CC@ MJIT_CFLAGS = @MJIT_CFLAGS@ MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ MJIT_LDSHARED = @MJIT_LDSHARED@ MJIT_DLDFLAGS = $(XDLDFLAGS) -MJIT_HEADER = rb_mjit_header.h -MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h -MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME) -MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch) MJIT_TABS=@MJIT_TABS@ YJIT_SUPPORT=@YJIT_SUPPORT@ YJIT_LIBS=@YJIT_LIBS@ @@ -183,7 +175,6 @@ MAJOR= @MAJOR@ MINOR= @MINOR@ TEENY= @TEENY@ -# here for MJIT_MIN_HEADER_NAME, not in common.mk RUBY_PROGRAM_VERSION = $(MAJOR).$(MINOR).$(TEENY) LIBRUBY_A = @LIBRUBY_A@ @@ -490,17 +481,8 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp) $(Q) $(RM) $@ $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS) -main: mjit-headers -yes-mjit-headers: $(MJIT_MIN_HEADER) clean-local:: - $(Q)$(RM) \ - $(MJIT_HEADER) $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h \ - $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h \ - $(MJIT_HEADER_INSTALL_DIR)/rb_mjit_min_header-*.h \ - $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time mjit_config.h \ - || $(NULLCMD) $(Q)$(RM) -r mjit_build_dir.* - -$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) $(MJIT_HEADER_BUILD_DIR) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD) # DTrace static library hacks described here: # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4 @@ -669,12 +651,6 @@ mjit_config.h: echo '#define RUBY_MJIT_CONFIG_H 1'; \ echo; \ sep=; \ - echo '#ifdef LOAD_RELATIVE'; \ - quote MJIT_HEADER_INSTALL_DIR "/$(MJIT_HEADER_INSTALL_DIR)"; \ - echo '#else'; \ - quote MJIT_HEADER_INSTALL_DIR "$(rubyarchhdrdir)"; \ - echo '#endif'; \ - quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(MJIT_CC); \ quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \ @@ -691,10 +667,10 @@ mjit_config.h: } > $@ yes-test-almost yes-test-all programs: mjit_build_dir.$(SOEXT) -mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) $(srcdir)/ruby-runner.c ruby-runner.h +mjit_build_dir.$(SOEXT): $(srcdir)/ruby-runner.c ruby-runner.h $(ECHO) making $@ $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) \ - -DMAKE_MJIT_BUILD_DIR=1 -DMJIT_MIN_HEADER='"$(MJIT_MIN_HEADER)"' \ + -DMAKE_MJIT_BUILD_DIR=1 \ $(OUTFLAG)$@ $(srcdir)/ruby-runner.c # yes-test-basic: leaked-globals |