From 35fe8a047d4a0d14c74708434e2e4ba2d845681d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20TH=C3=89BAUDEAU=22?=
 <benoit.thebaudeau@advansee.com>
Date: Tue, 31 May 2011 20:12:35 +0200
Subject: gcc: promote PKGVERSION and BUGURL options to toolchain level
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch promotes the PKGVERSION and BUGURL options to toolchain level so that
all toolchain components supporting them can benefit from them.

These options are passed to configure through --with-pkgversion and
--with-bugurl.

They are supported by binutils 2.18+, gcc 4.3+, eglibc 2.9+ and gdb 7.0+.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>

diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 770763d..bf33373 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -1,25 +1,5 @@
 # gcc configuration options
 
-config CC_PKGVERSION
-    string
-    prompt "gcc ID string"
-    depends on CC_GCC_HAS_PKGVERSION_BUGURL
-    default "crosstool-NG-${CT_VERSION}"
-    help
-      Specify a string that identifies your package. You may wish to include
-      a build number or build date. This version string will be included in
-      the output of gcc --version.
-
-      This is passed to the configure flag --with-pkgversion.
-
-config CC_BUGURL
-    string
-    prompt "gcc bug URL"
-    depends on CC_GCC_HAS_PKGVERSION_BUGURL
-    default ""
-    help
-      Specify the URL that users should visit if they wish to report a bug.
-
 config CC_ENABLE_CXX_FLAGS
     string
     prompt "Flags to pass to --enable-cxx-flags"
diff --git a/config/toolchain.in b/config/toolchain.in
index 072cf1b..4fdea14 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -66,6 +66,24 @@ config STATIC_TOOLCHAIN
       NOTE: this has no connection to whether the target libraries will be
       dynamic or static. This only applies to the tools themselves.
 
+config TOOLCHAIN_PKGVERSION
+    string
+    prompt "Toolchain ID string"
+    default "crosstool-NG-${CT_VERSION}"
+    help
+      Specify a string that identifies your package. You may wish to include
+      a build number or build date. This version string will be included in
+      the output of gcc --version.
+
+      This is passed to the configure flag --with-pkgversion.
+
+config TOOLCHAIN_BUGURL
+    string
+    prompt "Toolchain bug URL"
+    default ""
+    help
+      Specify the URL that users should visit if they wish to report a bug.
+
 comment "Tuple completion and aliasing"
 
 config TARGET_VENDOR
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index a390771..e191bb6 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -159,9 +159,11 @@ do_cc_core() {
     mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}"
     cd "${CT_BUILD_DIR}/build-cc-core-${mode}"
 
-    # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
-    [ -n "${CT_CC_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_CC_BUGURL}")
-    [ -n "${CT_CC_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}")
+    if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
+        # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
+        [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
+    fi
 
     if [ "${copy_headers}" = "y" ]; then
         CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
@@ -401,9 +403,11 @@ do_cc() {
         fi
     done
 
-    [ "${CT_SHARED_LIBS}" = "y" ]                   || extra_config+=("--disable-shared")
-    [ -n "${CT_CC_PKGVERSION}" ]                    && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}")
-    [ -n "${CT_CC_BUGURL}" ]                        && extra_config+=("--with-bugurl=${CT_CC_BUGURL}")
+    [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
+    if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
+        [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
+    fi
     case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
         y)  extra_config+=("--enable-sjlj-exceptions");;
         m)  ;;
-- 
cgit v0.10.2-6-g49f6