From 31f4b2d86bfbc753cec9be376719acc4b120e944 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 Mar 2023 21:41:48 -0800 Subject: Drop obsoleted MJIT header (#7458) RJIT doesn't need this. --- defs/gmake.mk | 28 ---------------------------- defs/universal.mk | 5 ----- 2 files changed, 33 deletions(-) delete mode 100644 defs/universal.mk (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index e646968b6f..0c404e04e4 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -386,34 +386,6 @@ ifneq ($(filter update-bundled_gems refresh-gems,$(MAKECMDGOALS)),) update-gems: update-bundled_gems endif -ifeq ($(filter 0 1,$(words $(arch_flags))),) -$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \ - $(eval $$(MJIT_HEADER:.h=)-$(value x).h \ - $$(MJIT_MIN_HEADER:.h=)-$(value x).h \ - $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time \ - : ARCH_FLAG := -arch $(value x))) - -$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \ - $(eval $$(MJIT_HEADER:.h=)-$(value x).h: \ - $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time)) - -mjit_min_headers := $(patsubst -arch=%,$(MJIT_MIN_HEADER:.h=-%.h),$(arch_flags)) -$(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP) - @ set -e; set $(patsubst -arch=%,%,$(arch_flags)); \ - cd $(@D); h=$(@F:.h=); \ - exec > $(@F).new; \ - echo '#if 0'; \ - for arch; do\ - echo "#elif defined __$${arch}__"; \ - echo "# include \"$$h-$$arch.h\""; \ - done; \ - echo "#else"; echo "# error unsupported platform"; echo "#endif" - $(IFCHANGE) $@ $@.new - $(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR) - $(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F) - -endif - .SECONDARY: update-unicode-files .SECONDARY: update-unicode-auxiliary-files .SECONDARY: update-unicode-ucd-emoji-files diff --git a/defs/universal.mk b/defs/universal.mk deleted file mode 100644 index c34a31b356..0000000000 --- a/defs/universal.mk +++ /dev/null @@ -1,5 +0,0 @@ -arch_flags := $(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))) -ifeq ($(filter 0 1,$(words $(arch_flags))),) -override MJIT_HEADER_SUFFIX = -% -override MJIT_HEADER_ARCH = -$(word 2,$(ARCH_FLAG)) -endif -- cgit v1.2.1