Patchwork [2/2] gcc-4.7/gcc: disable sdt from configure.ac to keep compatibility with configure

login
register
mail settings
Submitter Robert Yang
Date Dec. 17, 2013, 11:33 a.m.
Message ID <f677358d229897036b768ab9e342a9bb5cd812b1.1387279561.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/63433/
State New
Headers show

Comments

Robert Yang - Dec. 17, 2013, 11:33 a.m.
We had disabled the sdt from configure, let's also disable it from
confgure.ac to keep them compatible.

BTW, the libstdc++-v3 of gcc-4.7 doesn't use the sdt, so we don't need
to edit libstdc++-v3/configure as gcc-4.8.

NOTE, this commit edit the patch gcc-4.7/disablesdt.patch directly.

[YOCTO #5657]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch b/meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch
index 8946afc..8f5b061 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch
@@ -6,12 +6,15 @@  but before libgcc is compiled for example.
 RP 2012/8/7
 
 Upstream-Status: Inappropriate [hack]
+---
+ gcc/configure    | 12 ++++++------
+ gcc/configure.ac | 18 +++++++++---------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
 
-Index: git/gcc/configure
-===================================================================
---- git.orig/gcc/configure	2012-08-07 21:18:42.319247701 +0000
-+++ git/gcc/configure	2012-08-07 21:19:08.939247082 +0000
-@@ -26758,12 +26758,12 @@
+diff --git a/gcc/configure b/gcc/configure
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -26817,12 +26817,12 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
  $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
  have_sys_sdt_h=no
@@ -30,3 +33,34 @@  Index: git/gcc/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
  $as_echo "$have_sys_sdt_h" >&6; }
  
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -4688,15 +4688,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
+ fi
+ 
+ # Test for <sys/sdt.h> on the target.
+-GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
+-AC_MSG_CHECKING(sys/sdt.h in the target C library)
+-have_sys_sdt_h=no
+-if test -f $target_header_dir/sys/sdt.h; then
+-  have_sys_sdt_h=yes
+-  AC_DEFINE(HAVE_SYS_SDT_H, 1,
+-            [Define if your target C library provides sys/sdt.h])
+-fi
+-AC_MSG_RESULT($have_sys_sdt_h)
++#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
++#AC_MSG_CHECKING(sys/sdt.h in the target C library)
++#have_sys_sdt_h=no
++#if test -f $target_header_dir/sys/sdt.h; then
++#  have_sys_sdt_h=yes
++#  AC_DEFINE(HAVE_SYS_SDT_H, 1,
++#            [Define if your target C library provides sys/sdt.h])
++#fi
++#AC_MSG_RESULT($have_sys_sdt_h)
+ 
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
+-- 
+1.8.3.1
+