# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1271363718 -7200
# Node ID 6df2d4f7894814004d1261adaf9e74b88da231af
# Parent  57b3224f442a007a3e3d9cc696442705f39d0d5a
cc/gcc: add support for 4.5.0 or later versions

starting with 4.5.0, gcc requires libelf.

diff -r 57b3224f442a -r 6df2d4f78948 config/cc/gcc.in
--- a/config/cc/gcc.in	Thu Apr 15 22:35:15 2010 +0200
+++ b/config/cc/gcc.in	Thu Apr 15 22:35:18 2010 +0200
@@ -121,6 +121,14 @@
     select CC_GCC_4_2_or_later
     select CC_GCC_USE_PPL_CLOOG_MPC
 
+config CC_GCC_4_5_or_later
+    bool
+    default n
+    select CC_GCC_4_4_or_later
+    select CC_GCC_4_3_or_later
+    select CC_GCC_4_2_or_later
+    select CC_GCC_USE_LIBELF
+
 config CC_GCC_USE_GMP_MPFR
     bool
     default n
@@ -134,6 +142,11 @@
     select CLOOG
     select MPC
 
+config CC_GCC_USE_LIBELF
+    bool
+    default n
+    select LIBELF
+
 config CC_VERSION
     string
 # Don't remove next line
diff -r 57b3224f442a -r 6df2d4f78948 scripts/addToolVersion.sh
--- a/scripts/addToolVersion.sh	Thu Apr 15 22:35:15 2010 +0200
+++ b/scripts/addToolVersion.sh	Thu Apr 15 22:35:18 2010 +0200
@@ -100,7 +100,10 @@
             ver_M=$(echo "${version}...." |cut -d . -f 1)
             ver_m=$(echo "${version}...." |cut -d . -f 2)
             if [    ${ver_M} -gt 4                          \
-                 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \)  ]; then
+                 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 5 \)  ]; then
+                SedExpr1="${SedExpr1}\n    select CC_GCC_4_5_or_later"
+            elif [    ${ver_M} -gt 4                          \
+                   -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \)  ]; then
                 SedExpr1="${SedExpr1}\n    select CC_GCC_4_4_or_later"
             elif [    ${ver_M} -gt 4                          \
                    -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \)  ]; then
diff -r 57b3224f442a -r 6df2d4f78948 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Thu Apr 15 22:35:15 2010 +0200
+++ b/scripts/build/cc/gcc.sh	Thu Apr 15 22:35:18 2010 +0200
@@ -171,6 +171,9 @@
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
     fi
+    if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
+        extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
+    fi
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
 
@@ -333,6 +336,9 @@
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
     fi
+    if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
+        extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
+    fi
 
     if [ "${CT_THREADS}" = "none" ]; then
         extra_config+=("--disable-threads")