summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYann E. MORIN <devnull@localhost>2009-06-17 09:38:04 (GMT)
committerYann E. MORIN <devnull@localhost>2009-06-17 09:38:04 (GMT)
commit302dd084c2e782ea5fdbde1db9f1b2bcda5ac83f (patch)
tree2bd1601131ca41844086fcdcaccffcc7438a66ee /config
parenta393a72f5f7b0f0f48f11782d70b255c6ca5f740 (diff)
parenta7ff05b022a8db08185486fa0fbf324f2ecd9d3e (diff)
[gcc] Merge the gcc-4.4 suport to the default branch, from 1407:83083566fdd0
Diffstat (limited to 'config')
-rw-r--r--config/cc/gcc.in1
-rw-r--r--config/companion_libs.in65
-rw-r--r--config/companion_libs/cloog.in19
-rw-r--r--config/companion_libs/gmp.in8
-rw-r--r--config/companion_libs/mpc.in19
-rw-r--r--config/companion_libs/mpfr.in8
-rw-r--r--config/companion_libs/ppl.in14
-rw-r--r--config/debug/gdb.in8
8 files changed, 92 insertions, 50 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index f601c0d..3a672b0 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -130,6 +130,7 @@ config CC_GCC_4_3_or_later
config CC_GCC_4_4_or_later
bool
default n
+ select PPL_CLOOG_MPC
config CC_VERSION
string
diff --git a/config/companion_libs.in b/config/companion_libs.in
index d581d80..9b059f0 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -20,35 +20,68 @@ config GMP_MPFR
- gcc
- gdb
-config GMP_MPFR_TARGET
- bool
- prompt "Build libraries for the target"
- depends on GMP_MPFR
- depends on ! BARE_METAL
- default n
- help
- Also build libraries for the target. This can be usefull if you want
- to later build a compiler that will run on the target, or if you want
- to run gdb natively on the target.
-
if GMP_MPFR
source config/companion_libs/gmp.in
source config/companion_libs/mpfr.in
endif
-config PPL_CLOOG
+config PPL_CLOOG_MPC
bool
- prompt "PPL and GLooG/PPL"
+ prompt "PPL, GLooG/PPL and MPC"
help
- gcc-4.4.0 and above requires both PPL and CLooG/PPL to build some
- parts of the optimiser (GRAPHITE loop optimisation, to be precise).
+ gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts
+ of the optimiser (GRAPHITE loop optimisation, to be precise).
+
+ In addition to those, gcc-4.4 also optionally uses MPC to enable
+ additional optimisations on complex numbers. Although MPC is optional,
+ crosstool-NG requires it and uses it to build gcc >= 4.4.0.
These will be automatically selected if you choose gcc>=4.4.0, but you
can say 'Y' here, although it is unknown yet if any other component
can use them.
-if PPL_CLOOG
+if PPL_CLOOG_MPC
source config/companion_libs/ppl.in
+source config/companion_libs/cloog.in
+source config/companion_libs/mpc.in
endif
+config FOO
+ bool
+
+comment "Companion libraries common options"
+ depends on GMP_MPFR || PPL_CLOOG_MPC
+
+config COMP_LIBS_CHECK
+ bool
+ prompt "| Check the companion libraries builds (!!! READ HELP!!!)"
+ depends on GMP_MPFR || PPL_CLOOG_MPC
+ default n
+ help
+ It is highly recommended to check the newly built companion libraries.
+ Unfortunately, this is a very intensive task, and takes a loooong time.
+
+ Checking the newly built companion libraries is thus disabled by default,
+ but it is suggested that you check them at least once on your machine,
+ and if they work, disable the check on subsequent builds.
+
+ If you suspect that one (or more) of your companion libraries is the
+ cause for incorrectly generated code, you should answer 'Y' here.
+ Note however that this will take a really long time. For example,
+ building PPL on my machine takes roughly 1'40", while checking it takes
+ about 1h40'...
+
+config COMP_LIBS_TARGET
+ bool
+ prompt "| Build companion libraries for the target"
+ depends on GMP_MPFR || PPL_CLOOG_MPC
+ depends on ! BARE_METAL
+ default n
+ help
+ Also build companion libraries for the target. This can be usefull if
+ you want to later build a compiler that will run on the target, or if
+ you want to run gdb natively on the target.
+
+ Please note that for now, crosstool-NG can only build GMP and MPFR so.
+
endmenu
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
new file mode 100644
index 0000000..99779c9
--- /dev/null
+++ b/config/companion_libs/cloog.in
@@ -0,0 +1,19 @@
+# CLooG options
+
+choice
+ bool
+ prompt "CLooG/ppl version"
+
+config CLOOG_V_0_15_3
+ bool
+ prompt "0.15.3"
+
+# CT_INSERT_VERSION_ABOVE
+# Don't remove above line!
+endchoice
+
+config CLOOG_VERSION
+ string
+ default "0.15.3" if CLOOG_V_0_15_3
+# CT_INSERT_VERSION_STRING_ABOVE
+# Don't remove above line!
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 0ac2b2c..c4fc246 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -22,11 +22,3 @@ config GMP_VERSION
default "4.2.4" if GMP_V_4_2_4
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
-
-config GMP_CHECK
- bool
- prompt "Check GMP"
- default y
- help
- It is highly recommended that 'make check' is run against the newly built
- GMP library. See http://gmplib.org/
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
new file mode 100644
index 0000000..0aa1369
--- /dev/null
+++ b/config/companion_libs/mpc.in
@@ -0,0 +1,19 @@
+# MPC options
+
+choice
+ bool
+ prompt "MPC version"
+
+config MPC_V_0_6
+ bool
+ prompt "0.6"
+
+# CT_INSERT_VERSION_ABOVE
+# Don't remove above line!
+endchoice
+
+config MPC_VERSION
+ string
+ default "0.6" if MPC_V_0_6
+# CT_INSERT_VERSION_STRING_ABOVE
+# Don't remove above line!
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index dcea326..910ab4e 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -32,11 +32,3 @@ config MPFR_VERSION
default "2.4.1" if MPFR_V_2_4_1
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
-
-config MPFR_CHECK
- bool
- prompt "Check MPFR"
- default y
- help
- It is highly recommended that 'make check' is run against the newly built
- MPFR library. See http://gmplib.org/
diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
index d8f5906..efdeabf 100644
--- a/config/companion_libs/ppl.in
+++ b/config/companion_libs/ppl.in
@@ -17,17 +17,3 @@ config PPL_VERSION
default "0.10.2" if PPL_V_0_10_2
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
-
-config PPL_CHECK
- bool
- prompt "Check PPL (!!! README !!!)"
- default n
- help
- Checking PPL is very intensive and takes a loooong time.
- The PPL folks do not recommend checking the library, but they do
- not recommend not checking it, either.
-
- Checking PPL is thus disabled by default.
-
- If you suspect that your PPL library is the cause for incorrectly
- generated code, you should answer 'Y' here.
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 865a5f8..f21123d 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -20,7 +20,7 @@ config GDB_CROSS_STATIC
help
A static cross gdb can be usefull if you debug on a machine that is
not the one that is used to compile the toolchain.
-
+
That way, you can share the cross-gdb without installing a toolchain
on every machine that will be used to debug target programs.
@@ -59,14 +59,14 @@ config GDB_NATIVE_USE_GMP_MPFR
default n
depends on GDB_NATIVE
select GMP_MPFR
- select GMP_MPFR_TARGET
+ select COMP_LIBS_TARGET
help
gdb can make use of the GMP and MPFR libraries.
-
+
While the cross-gdb (above) can use the libraries compiled for the
host, the native gdb needs the libraries for the target (where it will
eventually run).
-
+
Setting this option will force building the GMP and MPFR libraries for
the target, and configure the native gdb to use them.