diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-25 22:28:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-26 23:30:16 +0100 |
commit | 094f33efa946c1bc0403f39f3148115c132799b7 (patch) | |
tree | dae92ac16a39c26e5b8a9abb23da7d9bdced9526 /meta/recipes-devtools/gcc | |
parent | da2e04d0dd251c197e2d6c888fcf5951f5a31727 (diff) | |
download | poky-094f33efa946c1bc0403f39f3148115c132799b7.tar.gz |
gcc: Drop sdt (dtrace) header patch
Since we now have recipe specific sysroots we no longer need this patch
to avoid the dtrace headers affecting the build of gcc-runtime. Drop
the patch.
(From OE-Core rev: 9aa8ff2dbbbf38cb0c87efd32db64b8ddf485ddf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-11.2.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch | 110 |
2 files changed, 0 insertions, 111 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index 6fa344e961..1ab779533c 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc | |||
@@ -42,7 +42,6 @@ SRC_URI = "\ | |||
42 | file://0010-MIPS64-Default-to-N64-ABI.patch \ | 42 | file://0010-MIPS64-Default-to-N64-ABI.patch \ |
43 | file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ | 43 | file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ |
44 | file://0012-gcc-Fix-argument-list-too-long-error.patch \ | 44 | file://0012-gcc-Fix-argument-list-too-long-error.patch \ |
45 | file://0013-Disable-sdt.patch \ | ||
46 | file://0014-libtool.patch \ | 45 | file://0014-libtool.patch \ |
47 | file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 46 | file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
48 | file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 47 | file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch deleted file mode 100644 index 1e657666df..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
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 | |||
6 | We don't list dtrace in DEPENDS so we shouldn't be depending on this header. | ||
7 | It may or may not exist from preivous builds though. To be determinstic, disable | ||
8 | sdt.h usage always. This avoids build failures if the header is removed after configure | ||
9 | but before libgcc is compiled for example. | ||
10 | |||
11 | RP 2012/8/7 | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Disable sdt for libstdc++-v3. | ||
16 | |||
17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
18 | |||
19 | Upstream-Status: Inappropriate [hack] | ||
20 | --- | ||
21 | gcc/configure | 12 ++++++------ | ||
22 | gcc/configure.ac | 18 +++++++++--------- | ||
23 | libstdc++-v3/configure | 6 +++--- | ||
24 | libstdc++-v3/configure.ac | 2 +- | ||
25 | 4 files changed, 19 insertions(+), 19 deletions(-) | ||
26 | |||
27 | diff --git a/gcc/configure b/gcc/configure | ||
28 | index c5d3bc4ee2d..5160917d73e 100755 | ||
29 | --- a/gcc/configure | ||
30 | +++ b/gcc/configure | ||
31 | @@ -30812,12 +30812,12 @@ fi | ||
32 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 | ||
33 | $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } | ||
34 | have_sys_sdt_h=no | ||
35 | -if test -f $target_header_dir/sys/sdt.h; then | ||
36 | - have_sys_sdt_h=yes | ||
37 | - | ||
38 | -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | ||
39 | - | ||
40 | -fi | ||
41 | +#if test -f $target_header_dir/sys/sdt.h; then | ||
42 | +# have_sys_sdt_h=yes | ||
43 | +# | ||
44 | +#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | ||
45 | +# | ||
46 | +#fi | ||
47 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 | ||
48 | $as_echo "$have_sys_sdt_h" >&6; } | ||
49 | |||
50 | diff --git a/gcc/configure.ac b/gcc/configure.ac | ||
51 | index f83420326d6..50f78308e8a 100644 | ||
52 | --- a/gcc/configure.ac | ||
53 | +++ b/gcc/configure.ac | ||
54 | @@ -6653,15 +6653,15 @@ fi | ||
55 | AC_SUBST([enable_default_ssp]) | ||
56 | |||
57 | # Test for <sys/sdt.h> on the target. | ||
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 | +#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) | ||
68 | +#AC_MSG_CHECKING(sys/sdt.h in the target C library) | ||
69 | +#have_sys_sdt_h=no | ||
70 | +#if test -f $target_header_dir/sys/sdt.h; then | ||
71 | +# have_sys_sdt_h=yes | ||
72 | +# AC_DEFINE(HAVE_SYS_SDT_H, 1, | ||
73 | +# [Define if your target C library provides sys/sdt.h]) | ||
74 | +#fi | ||
75 | +#AC_MSG_RESULT($have_sys_sdt_h) | ||
76 | |||
77 | # Check if TFmode long double should be used by default or not. | ||
78 | # Some glibc targets used DFmode long double, but with glibc 2.4 | ||
79 | diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure | ||
80 | index a310e9feb6c..c879445b8a6 100755 | ||
81 | --- a/libstdc++-v3/configure | ||
82 | +++ b/libstdc++-v3/configure | ||
83 | @@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
84 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
85 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
86 | |||
87 | - if test $glibcxx_cv_sys_sdt_h = yes; then | ||
88 | +# if test $glibcxx_cv_sys_sdt_h = yes; then | ||
89 | |||
90 | -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | ||
91 | +#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | ||
92 | |||
93 | - fi | ||
94 | +# fi | ||
95 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5 | ||
96 | $as_echo "$glibcxx_cv_sys_sdt_h" >&6; } | ||
97 | |||
98 | diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac | ||
99 | index 3c799be82b1..3f63a8ec9ce 100644 | ||
100 | --- a/libstdc++-v3/configure.ac | ||
101 | +++ b/libstdc++-v3/configure.ac | ||
102 | @@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN | ||
103 | GLIBCXX_CHECK_SC_NPROC_ONLN | ||
104 | GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP | ||
105 | GLIBCXX_CHECK_SYSCTL_HW_NCPU | ||
106 | -GLIBCXX_CHECK_SDT_H | ||
107 | +#GLIBCXX_CHECK_SDT_H | ||
108 | |||
109 | # Check for available headers. | ||
110 | AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ | ||