瀏覽代碼

Remove BR2_PREFER_IMA

This option is barely used, no-one is maintaining it or extending
it. So let's remove it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 15 年之前
父節點
當前提交
7a0263525f
共有 6 個文件被更改,包括 0 次插入42 次删除
  1. 0 11
      Config.in
  2. 0 8
      package/busybox/busybox.mk
  3. 0 8
      package/busybox/initramfs.mk
  4. 0 7
      package/microcom/microcom.mk
  5. 0 4
      package/setserial/setserial.mk
  6. 0 4
      toolchain/gcc/Makefile.in

+ 0 - 11
Config.in

@@ -136,17 +136,6 @@ config BR2_JLEVEL
 	help
 	help
 	  Number of jobs to run simultaneously
 	  Number of jobs to run simultaneously
 
 
-config BR2_PREFER_IMA
-	bool "prefer IMA compiles"
-	help
-	  Where possible, compile package with Inter Module Analysis.
-	  This potentially uses alot of system resources on your compile
-	  host with the benefit of creating smaller binaries for the target.
-
-	  If unsure, say No.
-
-	  WARNING: This is highly experimental at the moment.
-
 config BR2_DEPRECATED
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
 	bool "Show packages that are deprecated or obsolete"
 	help
 	help

+ 0 - 8
package/busybox/busybox.mk

@@ -107,14 +107,6 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
 		ARCH=$(KERNEL_ARCH) \
 		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
 		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
-	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
-		-f scripts/Makefile.IMA
-endif
 
 
 $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
 $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
 ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
 ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)

+ 0 - 8
package/busybox/initramfs.mk

@@ -86,14 +86,6 @@ $(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
 		ARCH=$(KERNEL_ARCH) \
 		ARCH=$(KERNEL_ARCH) \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
 		busybox.links busybox
 		busybox.links busybox
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
-	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		-f scripts/Makefile.IMA
-endif
 
 
 $(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
 $(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \

+ 0 - 7
package/microcom/microcom.mk

@@ -46,14 +46,7 @@ $(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
 	touch $@
 	touch $@
 
 
 $(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
 $(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
-ifeq ($(BR2_PREFER_IMA),y)
-	(cd $(MICROCOM_DIR); \
-	 $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
-	 	$(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \
-	)
-else
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR)
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR)
-endif
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
 
 $(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom
 $(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom

+ 0 - 4
package/setserial/setserial.mk

@@ -36,10 +36,6 @@ endif
 	touch $(SETSERIAL_DIR)/gorhack.h
 	touch $(SETSERIAL_DIR)/gorhack.h
 	touch $@
 	touch $@
 
 
-ifeq ($(BR2_PREFER_IMA),y)
-SETSERIAL_CFLAGS=$(CFLAGS_COMBINE) $(CFLAGS_WHOLE_PROGRAM)
-endif
-
 $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked
 $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked
 	(cd $(SETSERIAL_DIR); rm -rf config.cache; \
 	(cd $(SETSERIAL_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_OPTS) \

+ 0 - 4
toolchain/gcc/Makefile.in

@@ -74,9 +74,5 @@ endif
 # and finally pull in config opts from the user
 # and finally pull in config opts from the user
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
 
 
-ifeq ($(BR2_PREFER_IMA),y)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--enable-intermodule
-endif # BR2_PREFER_IMA=y
-
 TARGETS+=gcc_target
 TARGETS+=gcc_target
 endif
 endif