Skip to contentSkip to conversation

gcc-4.8/libstdc++-v3: disable sdt

PATCH New Robert Yang 1 participant 3 messages Dec 17, 2013

lore
Share & tools
lore
#0 lore raw

cover gcc-4.8/libstdc++-v3: disable sdt

The following changes since commit 9daa1de753e58b7f678e68cf307f6028c0c79a6a:

qemu/local.conf.sample: Add sdl PACKAGECONFIG (2013-12-16 12:13:59 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib robert/gcc_sdt
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/gcc_sdt

Robert Yang (2):
gcc-4.8/libstdc++-v3: disable sdt
gcc-4.7/gcc: disable sdt from configure.ac to keep compatibility with
configure

 meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch | 44 ++++++++++--
 .../gcc/gcc-4.8/0031-Disable-sdt.patch             | 80 ++++++++++++++++++++--
 2 files changed, 113 insertions(+), 11 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 gcc-4.8/libstdc++-v3: disable sdt

We may meet such an error when building gcc/libstdc++-v3:

gcc-4.8.1/libstdc++-v3/libsupc++/unwind-cxx.h:41:21: fatal error:
sys/sdt.h: No such file or directory

We already have a patch to disable the sdt for gcc, we also need disable it for libstdc++-v3.

BTW, we need edit both configure.ac and configure to make them keep compatible.

NOTE, this commit edit the patch gcc-4.8/0031-Disable-sdt.patch directly.

[YOCTO #5657]

---
 .../gcc/gcc-4.8/0031-Disable-sdt.patch             | 80 ++++++++++++++++++++--
 1 file changed, 74 insertions(+), 6 deletions(-)
meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch +74 -6
index c714239..2c1d5e0 100644
@@ -1,4 +1,4 @@
-From eb70cb2785af7171897f363298bbfcd83de5ec57 Mon Sep 17 00:00:00 2001
+From b85265bc94ec1beaf1d3b697c03db62991553467 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 29 Mar 2013 09:28:10 +0400
 Subject: [PATCH 31/35] Disable sdt.
@@ -12,16 +12,23 @@ RP 2012/8/7
 
 Signed-off-by: Khem Raj <[email protected]>
 
+Disable sdt for libstdc++-v3.
+
+Signed-off-by: Robert Yang <[email protected]>
+
 Upstream-Status: Inappropriate [hack]
 ---
- gcc/configure |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ gcc/configure             | 12 ++++++------
+ gcc/configure.ac          | 18 +++++++++---------
+ libstdc++-v3/configure    |  6 +++---
+ libstdc++-v3/configure.ac |  2 +-
+ 4 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/gcc/configure b/gcc/configure
-index d587993..8bc0c98 100755
+index 3c550a6..01c7626 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26792,12 +26792,12 @@ fi
+@@ -26812,12 +26812,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
@@ -40,6 +47,67 @@ index d587993..8bc0c98 100755
  { $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
+index 3601ab6..06e501f 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -4779,15 +4779,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
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index 4953c9f..53a1145 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -20578,11 +20578,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-  if test $glibcxx_cv_sys_sdt_h = yes; then
++#  if test $glibcxx_cv_sys_sdt_h = yes; then
+ 
+-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
++#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+ 
+-  fi
++#  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
+ $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
+ 
+diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
+index 73d430a..f2135e2 100644
+--- a/libstdc++-v3/configure.ac
++++ b/libstdc++-v3/configure.ac
+@@ -211,7 +211,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
+ GLIBCXX_CHECK_SC_NPROC_ONLN
+ GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
+ GLIBCXX_CHECK_SYSCTL_HW_NCPU
+-GLIBCXX_CHECK_SDT_H
++#GLIBCXX_CHECK_SDT_H
+ 
+ # Check for available headers.
+ AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
 -- 
-1.7.10.4
+1.8.3.1
 
Signature · 1 line
1.8.3.1
#2 lore raw

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

In reply to Robert Yang

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]

---
 meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)
meta/recipes-devtools/gcc/gcc-4.7/disablesdt.patch +39 -5
index 8946afc..8f5b061 100644
@@ -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
+
Signature · 1 line
1.8.3.1