0013-Disable-sdt.patch 3.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110
  1. From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Fri, 29 Mar 2013 09:28:10 +0400
  4. Subject: [PATCH] Disable sdt.
  5. We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
  6. It may or may not exist from preivous builds though. To be determinstic, disable
  7. sdt.h usage always. This avoids build failures if the header is removed after configure
  8. but before libgcc is compiled for example.
  9. RP 2012/8/7
  10. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  11. Disable sdt for libstdc++-v3.
  12. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  13. Upstream-Status: Inappropriate [hack]
  14. ---
  15. gcc/configure | 12 ++++++------
  16. gcc/configure.ac | 18 +++++++++---------
  17. libstdc++-v3/configure | 6 +++---
  18. libstdc++-v3/configure.ac | 2 +-
  19. 4 files changed, 19 insertions(+), 19 deletions(-)
  20. diff --git a/gcc/configure b/gcc/configure
  21. index c5d3bc4ee2d..5160917d73e 100755
  22. --- a/gcc/configure
  23. +++ b/gcc/configure
  24. @@ -30812,12 +30812,12 @@ fi
  25. { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
  26. $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
  27. have_sys_sdt_h=no
  28. -if test -f $target_header_dir/sys/sdt.h; then
  29. - have_sys_sdt_h=yes
  30. -
  31. -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
  32. -
  33. -fi
  34. +#if test -f $target_header_dir/sys/sdt.h; then
  35. +# have_sys_sdt_h=yes
  36. +#
  37. +#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
  38. +#
  39. +#fi
  40. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
  41. $as_echo "$have_sys_sdt_h" >&6; }
  42. diff --git a/gcc/configure.ac b/gcc/configure.ac
  43. index f83420326d6..50f78308e8a 100644
  44. --- a/gcc/configure.ac
  45. +++ b/gcc/configure.ac
  46. @@ -6653,15 +6653,15 @@ fi
  47. AC_SUBST([enable_default_ssp])
  48. # Test for <sys/sdt.h> on the target.
  49. -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
  50. -AC_MSG_CHECKING(sys/sdt.h in the target C library)
  51. -have_sys_sdt_h=no
  52. -if test -f $target_header_dir/sys/sdt.h; then
  53. - have_sys_sdt_h=yes
  54. - AC_DEFINE(HAVE_SYS_SDT_H, 1,
  55. - [Define if your target C library provides sys/sdt.h])
  56. -fi
  57. -AC_MSG_RESULT($have_sys_sdt_h)
  58. +#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
  59. +#AC_MSG_CHECKING(sys/sdt.h in the target C library)
  60. +#have_sys_sdt_h=no
  61. +#if test -f $target_header_dir/sys/sdt.h; then
  62. +# have_sys_sdt_h=yes
  63. +# AC_DEFINE(HAVE_SYS_SDT_H, 1,
  64. +# [Define if your target C library provides sys/sdt.h])
  65. +#fi
  66. +#AC_MSG_RESULT($have_sys_sdt_h)
  67. # Check if TFmode long double should be used by default or not.
  68. # Some glibc targets used DFmode long double, but with glibc 2.4
  69. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
  70. index a310e9feb6c..c879445b8a6 100755
  71. --- a/libstdc++-v3/configure
  72. +++ b/libstdc++-v3/configure
  73. @@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  74. ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  75. ac_compiler_gnu=$ac_cv_c_compiler_gnu
  76. - if test $glibcxx_cv_sys_sdt_h = yes; then
  77. +# if test $glibcxx_cv_sys_sdt_h = yes; then
  78. -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
  79. +#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
  80. - fi
  81. +# fi
  82. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
  83. $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
  84. diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
  85. index 3c799be82b1..3f63a8ec9ce 100644
  86. --- a/libstdc++-v3/configure.ac
  87. +++ b/libstdc++-v3/configure.ac
  88. @@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
  89. GLIBCXX_CHECK_SC_NPROC_ONLN
  90. GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
  91. GLIBCXX_CHECK_SYSCTL_HW_NCPU
  92. -GLIBCXX_CHECK_SDT_H
  93. +#GLIBCXX_CHECK_SDT_H
  94. # Check for available headers.
  95. AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \