3 files changed, 23 insertions, 6 deletions
diff --git a/config/companion_libs.in b/config/companion_libs.in
index e230cf9..86c9706 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/tools/libelf.in b/config/companion_libs/libelf.in
index f195868..9cc76b8 100644
--- a/config/tools/libelf.in
+++ b/config/companion_libs/libelf.in
@@ -1,10 +1,5 @@
 # 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"
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 850ee74..bddc568 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