* cross-gcc.in, cross-gcc.make:

	include cross-ecj.in,
	new language selection


git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7342 f8d472c7-5700-0410-ac5a-87979cec3adf

2 files changed, 69 insertions, 30 deletions

diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 4b8cf22..79c20f8 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -6,54 +6,79 @@ menuconfig CROSS_GCC
 	bool
 	select CROSS_BINUTILS
 	select LIBC_FIRST
-        select HOST_GMP		if CROSS_GCC_43
-        select HOST_MPFR	if CROSS_GCC_43
+	select HOST_GMP		if CROSS_GCC_43
+	select HOST_MPFR	if CROSS_GCC_43
+	select CROSS_ECJ	if CROSS_GCC_LANG_JAVA
+
+if CROSS_GCC
 
 config CROSS_GCC_VERSION
-	depends on CROSS_GCC
 	string
 	prompt "gcc version"
-	default "4.2.3"
+	default "4.2.4"
 	help
 	  Specify the version of gcc here.
 
 config CROSS_GCC_43
-	depends on CROSS_GCC
 	bool
 	prompt "additional deps for gcc-4.3"
 	help
 	  Add new dependencies for gcc-4.3+: "GMP" and "MPFR"
 
-
 config CROSS_GCC_SERIES
-	depends on CROSS_GCC
 	string
 	default "series"
 	prompt "gcc patch series file"
 
-config CROSS_GCC_LANG
-	depends on CROSS_GCC
-	string
-	prompt "languages"
-	default "c,c++"
-	help
-	  As GCC is a compiler collection, you can enable various languages
-	  within this menu entry. Possible values are:
-	  'c' for standard C language
-	  'c++' for C++ language
-	  Delimiter is ','
-
 config CROSS_GCC_EXTRA_CONFIG
-	depends on CROSS_GCC
 	string
 	prompt "extra configure options"
 	help
 	  Add these extra options to the gcc configure script.
 
+comment "Additional supported languages:"
+
+config CROSS_GCC_LANG_C
+	bool
+	default y
+	help
+	  As GCC is a compiler collection, you it can support various languages
+	  Select this for standard C support
+
+config CROSS_GCC_LANG_CXX
+	bool
+	prompt "C++"
+	default y
+	help
+	  As GCC is a compiler collection, it can support various languages.
+	  Select this for C++ support
+
+config CROSS_GCC_LANG_FORTRAN
+	bool
+	prompt "Fortran"
+	help
+	  As GCC is a compiler collection, it can support various languages.
+	  Select this for Fortran support
+
+config CROSS_GCC_LANG_JAVA
+	bool
+	prompt "Java"
+	help
+	  As GCC is a compiler collection, it can support various languages.
+	  Select this for Java support
+
+source "workspace/rules/cross-ecj.in"
+
+endif
+
+###
+### --with-newlib
+###
 config CROSS_GCC_EXTRA_CONFIG_LIBC
 	string
 	default "--with-newlib" if LIBC_NEWLIB
 
+
 ###
 ### ___cxa_atexit
 ###
@@ -103,5 +128,5 @@ config CROSS_GCC_FIRST
 	bool
 	select CROSS_BINUTILS
 	select LIBC_HEADERS
-        select HOST_GMP		if CROSS_GCC_43
-        select HOST_MPFR	if CROSS_GCC_43
+	select HOST_GMP		if CROSS_GCC_43
+	select HOST_MPFR	if CROSS_GCC_43
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index dc0df72..e7743dc 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -82,6 +82,15 @@ ifdef PTXCONF_HOST_MPFR
 CROSS_GCC_AUTOCONF_COMMON += --with-mpfr=$(PTXCONF_SYSROOT_HOST)
 endif
 
+#
+# for other architectures than AVR its not usefull to have multilib,
+# but we need a sysroot for them
+#
+ifndef PTXCONF_ARCH_AVR
+CROSS_GCC_AUTOCONF_COMMON += \
+	--disable-multilib \
+	--with-sysroot=$(SYSROOT)
+endif
 
 #   --enable-tls            enable or disable generation of tls code
 #                           overriding the assembler check for tls support
@@ -92,19 +101,19 @@ endif
 #   --with-long-double-128  Use 128-bit long double by default.
 
 
-# for other architectures than AVR its not usefull to have multilib,
-# but we need a sysroot for them
-ifndef PTXCONF_ARCH_AVR
-CROSS_GCC_AUTOCONF_COMMON += \
-	--disable-multilib \
-	--with-sysroot=$(SYSROOT)
-endif
+#
+# language selection
+#
+CROSS_GCC_LANG-$(PTXCONF_CROSS_GCC_LANG_C)		+= c
+CROSS_GCC_LANG-$(PTXCONF_CROSS_GCC_LANG_CXX)		+= c++
+CROSS_GCC_LANG-$(PTXCONF_CROSS_GCC_LANG_JAVA)		+= java
+CROSS_GCC_LANG-$(PTXCONF_CROSS_GCC_LANG_FORTRAN)	+= fortran
 
 CROSS_GCC_AUTOCONF := \
 	$(CROSS_GCC_AUTOCONF_COMMON) \
 	--prefix=$(PTXCONF_SYSROOT_CROSS) \
 	\
-	--enable-languages=$(PTXCONF_CROSS_GCC_LANG) \
+	--enable-languages=$(subst $(space),$(comma),$(CROSS_GCC_LANG-y)) \
 	--enable-threads=$(PTXCONF_CROSS_GCC_THREADS) \
 	--enable-c99 \
 	--enable-long-long \
@@ -114,6 +123,11 @@ CROSS_GCC_AUTOCONF := \
 	\
 	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED)
 
+ifdef PTXCONF_CROSS_GCC_LANG_JAVA
+CROSS_GCC_AUTOCONF += --with-ecj-jar=$(CROSS_ECJ_SOURCE)
+endif
+
+
 $(STATEDIR)/cross-gcc.prepare:
 	@$(call targetinfo)
 	@$(call clean, $(CROSS_GCC_BUILDDIR))