Browse Source

Add configure option to allow IMA compiling

Peter S. Mazinger 18 years ago
parent
commit
8789ec4134
2 changed files with 11 additions and 1 deletions
  1. 5 1
      Rules.mak
  2. 6 0
      extra/Configs/Config.in

+ 5 - 1
Rules.mak

@@ -312,6 +312,7 @@ else
     LDFLAGS := $(LDFLAGS_NOSTRIP) -s
     LDFLAGS := $(LDFLAGS_NOSTRIP) -s
 endif
 endif
 
 
+ifeq ($(DOMULTI),y)
 # we try to compile all sources at once into an object (IMA), but
 # we try to compile all sources at once into an object (IMA), but
 # gcc-3.3.x does not support it
 # gcc-3.3.x does not support it
 # gcc-3.4.x supports it, but does not need and support --combine
 # gcc-3.4.x supports it, but does not need and support --combine
@@ -319,10 +320,13 @@ endif
 # gcc-4.1(200506xx) supports it, but needs the --combine flag, else libs are useless
 # gcc-4.1(200506xx) supports it, but needs the --combine flag, else libs are useless
 GCC_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1,2)
 GCC_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1,2)
 ifeq ($(GCC_VER),3.3)
 ifeq ($(GCC_VER),3.3)
-DOMULTI=n
+DOMULTI:=n
 else
 else
 CFLAGS+=$(call check_gcc,--combine,)
 CFLAGS+=$(call check_gcc,--combine,)
 endif
 endif
+else
+DOMULTI:=n
+endif
 
 
 ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)

+ 6 - 0
extra/Configs/Config.in

@@ -1335,6 +1335,12 @@ config WARNINGS
 	help
 	help
 	  Set this to the set of gcc warnings you wish to see while compiling.
 	  Set this to the set of gcc warnings you wish to see while compiling.
 
 
+config DOMULTI
+	bool "Compile all sources at once into an object"
+	default n
+	help
+	  Set this to compile all sources at once into an object (IMA).
+
 config UCLIBC_MJN3_ONLY
 config UCLIBC_MJN3_ONLY
 	bool "Manuel's hidden warnings"
 	bool "Manuel's hidden warnings"
 	default n
 	default n