From 991b90f2425a6f14115efee2456919063d4e1a2b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 17 Feb 2010 23:41:17 +0100
Subject: comp-libs: make libelf a companion library

When gcc-4.5 is out, it will require libelf. So better make it a
companion library now rather than postponing the ineluctable.
---
 config/companion_libs.in        | 22 ++++++++++++++++++++++
 config/companion_libs/libelf.in | 30 ++++++++++++++++++++++++++++++
 config/debug/ltrace.in          |  2 +-
 config/tools/libelf.in          | 35 -----------------------------------
 4 files changed, 53 insertions(+), 36 deletions(-)
 create mode 100644 config/companion_libs/libelf.in
 delete mode 100644 config/tools/libelf.in

(limited to 'config')

diff --git a/config/companion_libs.in b/config/companion_libs.in
index e230cf93..86c9706b 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -100,6 +100,20 @@ config MPC
       can say 'Y' here, although it is unknown yet if any other component
       can use it.
 
+config LIBELF
+    bool
+#    prompt "libelf"
+    select COMPLIBS
+    select WRAPPER_NEEDED
+    help
+      gcc-4.5.0 and above can also use libelf to enable some optimisation
+      (LTO, Link-Time Optimisation, to be precise).  Although libelf is
+      optional, crosstool-NG requires it and uses it to build gcc >= 4.5.0.
+      
+      This will be automatically selected if you choose gcc>=4.5.0, but you
+      can say 'Y' here, although it is unknown yet if any other component
+      can use it.
+
 config GMP_TARGET
     bool
 
@@ -125,6 +139,9 @@ config MPC_TARGET
     select PPL_TARGET
     select CLOOG_TARGET
 
+config LIBELF_TARGET
+    bool
+
 if GMP || GMP_TARGET
 comment "GMP version needed to build for target"
     depends on !GMP
@@ -150,6 +167,11 @@ comment "MPC version needed to build for target"
     depends on !MPC
 source config/companion_libs/mpc.in
 endif
+if LIBELF || LIBELF_TARGET
+comment "libelf version needed to build for target"
+    depends on !LIBELF
+source config/companion_libs/libelf.in
+endif
 
 config FOO
     bool
diff --git a/config/companion_libs/libelf.in b/config/companion_libs/libelf.in
new file mode 100644
index 00000000..9cc76b86
--- /dev/null
+++ b/config/companion_libs/libelf.in
@@ -0,0 +1,30 @@
+# libelf config file
+
+choice
+    bool
+    prompt "libelf version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBELF_V_0_8_12
+    bool
+    prompt "0.8.12"
+
+config LIBELF_V_0_8_11
+    bool
+    prompt "0.8.11"
+
+config LIBELF_V_0_8_10
+    bool
+    prompt "0.8.10 (OBSOLETE)"
+    depends on OBSOLETE
+
+endchoice
+
+config LIBELF_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "0.8.12" if LIBELF_V_0_8_12
+    default "0.8.11" if LIBELF_V_0_8_11
+    default "0.8.10" if LIBELF_V_0_8_10
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 850ee741..bddc568e 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -1,7 +1,7 @@
 # ltrace
 
 config DEBUG_ltrace
-    select TOOL_libelf
+    select LIBELF_TARGET
     help
       ltrace is a program that simply runs the specified command until it exits.
       It intercepts and records the dynamic library calls which are called by
diff --git a/config/tools/libelf.in b/config/tools/libelf.in
deleted file mode 100644
index f195868e..00000000
--- a/config/tools/libelf.in
+++ /dev/null
@@ -1,35 +0,0 @@
-# libelf config file
-
-config TOOL_libelf
-    help
-      libelf lets you read, modify or create ELF files in an
-      architecture-independent way.
-
-choice
-    bool
-    prompt "libelf version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBELF_V_0_8_12
-    bool
-    prompt "0.8.12"
-
-config LIBELF_V_0_8_11
-    bool
-    prompt "0.8.11"
-
-config LIBELF_V_0_8_10
-    bool
-    prompt "0.8.10 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config LIBELF_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.8.12" if LIBELF_V_0_8_12
-    default "0.8.11" if LIBELF_V_0_8_11
-    default "0.8.10" if LIBELF_V_0_8_10
-- 
cgit v1.2.3