* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
@ 2018-04-06 17:08 Daniel Díaz Rodríguez
2018-04-06 20:43 ` akuster808
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Díaz Rodríguez @ 2018-04-06 17:08 UTC (permalink / raw)
To: openembedded-core
Ping on this series for Morty.
--
ddiaz
On 13 March 2018 at 11:17, Daniel Díaz <daniel.diaz@linaro.org> wrote:
> From: Fathi Boudra <fathi.boudra@linaro.org>
>
> Patch submitted upstream, pending to be merged:
> https://sourceware.org/bugzilla/show_bug.cgi?id=21286
>
> (From OE-Core rev: 11ebb5054e5ec1171ade90249e3a30ac8174a35a)
>
> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> ...o.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch | 69 ++++++++++++++++++++++
> meta/recipes-core/glibc/glibc_2.24.bb | 1 +
> 2 files changed, 70 insertions(+)
> create mode 100644 meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch b/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
> new file mode 100644
> index 0000000..fe22cc3
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
> @@ -0,0 +1,69 @@
> +From af3054b3856379d353a779801678f330e1b58c9a Mon Sep 17 00:00:00 2001
> +Message-Id: <af3054b3856379d353a779801678f330e1b58c9a.1490183611.git.panand@redhat.com>
> +From: Pratyush Anand <panand@redhat.com>
> +Date: Wed, 22 Mar 2017 17:02:38 +0530
> +Subject: [PATCH] bits/siginfo.h: enum definition for TRAP_HWBKPT is missing
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Compile following linux kernel test code with latest glibc:
> +
> +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
> +
> +and we get following error:
> +breakpoint_test_arm64.c: In function ‘run_test’:
> +breakpoint_test_arm64.c:171:25: error: ‘TRAP_HWBKPT’ undeclared (first use in this function)
> + if (siginfo.si_code != TRAP_HWBKPT) {
> + ^
> +I can compile test code by modifying my local
> +/usr/include/bits/siginfo.h and test works great. Therefore, this patch
> +will be needed in upstream glibc so that issue is fixed there as well.
> +
> +Signed-off-by: Pratyush Anand <panand@redhat.com>
> +
> +Upstream-Status : Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=21286]
> +---
> + bits/siginfo.h | 6 +++++-
> + sysdeps/unix/sysv/linux/bits/siginfo.h | 6 +++++-
> + 2 files changed, 10 insertions(+), 2 deletions(-)
> +
> +diff --git a/bits/siginfo.h b/bits/siginfo.h
> +index 4919df543634..6dc714e8f30b 100644
> +--- a/bits/siginfo.h
> ++++ b/bits/siginfo.h
> +@@ -140,8 +140,12 @@ enum
> + {
> + TRAP_BRKPT = 1, /* Process breakpoint. */
> + # define TRAP_BRKPT TRAP_BRKPT
> +- TRAP_TRACE /* Process trace trap. */
> ++ TRAP_TRACE, /* Process trace trap. */
> + # define TRAP_TRACE TRAP_TRACE
> ++ TRAP_BRANCH, /* Process branch trap. */
> ++# define TRAP_BRANCH TRAP_BRANCH
> ++ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
> ++# define TRAP_HWBKPT TRAP_HWBKPT
> + };
> + # endif
> +
> +diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h
> +index 7b0d4f62a331..9cdf42a42557 100644
> +--- a/sysdeps/unix/sysv/linux/bits/siginfo.h
> ++++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
> +@@ -235,8 +235,12 @@ enum
> + {
> + TRAP_BRKPT = 1, /* Process breakpoint. */
> + # define TRAP_BRKPT TRAP_BRKPT
> +- TRAP_TRACE /* Process trace trap. */
> ++ TRAP_TRACE, /* Process trace trap. */
> + # define TRAP_TRACE TRAP_TRACE
> ++ TRAP_BRANCH, /* Process branch trap. */
> ++# define TRAP_BRANCH TRAP_BRANCH
> ++ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
> ++# define TRAP_HWBKPT TRAP_HWBKPT
> + };
> + # endif
> +
> +--
> +2.9.3
> +
> diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb
> index 6ea4585..09694f2 100644
> --- a/meta/recipes-core/glibc/glibc_2.24.bb
> +++ b/meta/recipes-core/glibc/glibc_2.24.bb
> @@ -38,6 +38,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
> file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
> file://0026-build_local_scope.patch \
> file://0028-Bug-20116-Fix-use-after-free-in-pthread_create.patch \
> + file://0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch \
> file://CVE-2016-6323.patch \
> file://0001-Add-atomic_exchange_relaxed.patch \
> file://0002-Add-atomic-operations-required-by-the-new-condition-.patch \
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-04-06 17:08 [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions Daniel Díaz Rodríguez
@ 2018-04-06 20:43 ` akuster808
2018-05-16 21:20 ` Daniel Díaz
0 siblings, 1 reply; 11+ messages in thread
From: akuster808 @ 2018-04-06 20:43 UTC (permalink / raw)
To: Daniel Díaz Rodríguez, openembedded-core
On 04/06/2018 10:08 AM, Daniel Díaz Rodríguez wrote:
> Ping on this series for Morty.
This needs to be ported to Pyro first. I do it this weekend and morty too.
- armin
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-04-06 20:43 ` akuster808
@ 2018-05-16 21:20 ` Daniel Díaz
2018-06-11 17:30 ` Daniel Díaz
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Díaz @ 2018-05-16 21:20 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-core
On 6 April 2018 at 15:43, akuster808 <akuster808@gmail.com> wrote:
> On 04/06/2018 10:08 AM, Daniel Díaz Rodríguez wrote:
>> Ping on this series for Morty.
> This needs to be ported to Pyro first. I do it this weekend and morty too.
Ping on this series for Morty.
--
ddiaz
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-05-16 21:20 ` Daniel Díaz
@ 2018-06-11 17:30 ` Daniel Díaz
2018-06-11 21:38 ` akuster808
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Díaz @ 2018-06-11 17:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 16 May 2018 at 16:20, Daniel Díaz <daniel.diaz@linaro.org> wrote:
> On 6 April 2018 at 15:43, akuster808 <akuster808@gmail.com> wrote:
>> On 04/06/2018 10:08 AM, Daniel Díaz Rodríguez wrote:
>>> Ping on this series for Morty.
>> This needs to be ported to Pyro first. I do it this weekend and morty too.
> Ping on this series for Morty.
Ping on this series for Morty.
--
ddiaz
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-11 17:30 ` Daniel Díaz
@ 2018-06-11 21:38 ` akuster808
2018-06-11 21:46 ` Andre McCurdy
0 siblings, 1 reply; 11+ messages in thread
From: akuster808 @ 2018-06-11 21:38 UTC (permalink / raw)
To: Daniel Díaz, Patches and discussions about the oe-core layer
On 06/11/2018 10:30 AM, Daniel Díaz wrote:
> On 16 May 2018 at 16:20, Daniel Díaz <daniel.diaz@linaro.org> wrote:
>> On 6 April 2018 at 15:43, akuster808 <akuster808@gmail.com> wrote:
>>> On 04/06/2018 10:08 AM, Daniel Díaz Rodríguez wrote:
>>>> Ping on this series for Morty.
>>> This needs to be ported to Pyro first. I do it this weekend and morty too.
>> Ping on this series for Morty.
> Ping on this series for Morty.
this is in the stable/morty-next branch which is on hold for the current
morty QA.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
regards,
Armin
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-11 21:38 ` akuster808
@ 2018-06-11 21:46 ` Andre McCurdy
2018-06-18 19:20 ` Daniel Díaz
0 siblings, 1 reply; 11+ messages in thread
From: Andre McCurdy @ 2018-06-11 21:46 UTC (permalink / raw)
To: akuster808; +Cc: Patches and discussions about the oe-core layer
On Mon, Jun 11, 2018 at 2:38 PM, akuster808 <akuster808@gmail.com> wrote:
> On 06/11/2018 10:30 AM, Daniel Díaz wrote:
>> On 16 May 2018 at 16:20, Daniel Díaz <daniel.diaz@linaro.org> wrote:
>>> On 6 April 2018 at 15:43, akuster808 <akuster808@gmail.com> wrote:
>>>> On 04/06/2018 10:08 AM, Daniel Díaz Rodríguez wrote:
>>>>> Ping on this series for Morty.
>>>> This needs to be ported to Pyro first. I do it this weekend and morty too.
>>> Ping on this series for Morty.
>> Ping on this series for Morty.
>
> this is in the stable/morty-next branch which is on hold for the current
> morty QA.
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
That's a link for stable/pyro-next.
The change doesn't seem to be in stable/morty-next though:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stable/morty-next
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-11 21:46 ` Andre McCurdy
@ 2018-06-18 19:20 ` Daniel Díaz
2018-06-26 22:33 ` akuster808
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Díaz @ 2018-06-18 19:20 UTC (permalink / raw)
To: akuster808; +Cc: Patches and discussions about the oe-core layer
Hello!
On 11 June 2018 at 16:46, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Mon, Jun 11, 2018 at 2:38 PM, akuster808 <akuster808@gmail.com> wrote:
>> On 06/11/2018 10:30 AM, Daniel Díaz wrote:
>>> Ping on this series for Morty.
>>
>> this is in the stable/morty-next branch which is on hold for the current
>> morty QA.
>> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
>
> That's a link for stable/pyro-next.
> The change doesn't seem to be in stable/morty-next though:
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stable/morty-next
Is there anything from my side that needs to be done for this patch?
Thanks and greetings!
Daniel Díaz
daniel.diaz@linaro.org
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-18 19:20 ` Daniel Díaz
@ 2018-06-26 22:33 ` akuster808
2018-06-26 22:54 ` Andre McCurdy
0 siblings, 1 reply; 11+ messages in thread
From: akuster808 @ 2018-06-26 22:33 UTC (permalink / raw)
To: Daniel Díaz; +Cc: Patches and discussions about the oe-core layer
On 06/18/2018 12:20 PM, Daniel Díaz wrote:
> Hello!
>
>
> On 11 June 2018 at 16:46, Andre McCurdy <armccurdy@gmail.com> wrote:
>> On Mon, Jun 11, 2018 at 2:38 PM, akuster808 <akuster808@gmail.com> wrote:
>>> On 06/11/2018 10:30 AM, Daniel Díaz wrote:
>>>> Ping on this series for Morty.
>>> this is in the stable/morty-next branch which is on hold for the current
>>> morty QA.
>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
>> That's a link for stable/pyro-next.
>> The change doesn't seem to be in stable/morty-next though:
>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stable/morty-next
> Is there anything from my side that needs to be done for this patch?
Nope. I have it in the stable/moryt mut branch and trying to address
build issues.
- armin
>
> Thanks and greetings!
>
> Daniel Díaz
> daniel.diaz@linaro.org
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-26 22:33 ` akuster808
@ 2018-06-26 22:54 ` Andre McCurdy
2018-06-26 23:10 ` akuster808
0 siblings, 1 reply; 11+ messages in thread
From: Andre McCurdy @ 2018-06-26 22:54 UTC (permalink / raw)
To: akuster808; +Cc: Patches and discussions about the oe-core layer
On Tue, Jun 26, 2018 at 3:33 PM, akuster808 <akuster808@gmail.com> wrote:
> On 06/18/2018 12:20 PM, Daniel Díaz wrote:
>> On 11 June 2018 at 16:46, Andre McCurdy <armccurdy@gmail.com> wrote:
>>> On Mon, Jun 11, 2018 at 2:38 PM, akuster808 <akuster808@gmail.com> wrote:
>>>> On 06/11/2018 10:30 AM, Daniel Díaz wrote:
>>>>> Ping on this series for Morty.
>>>> this is in the stable/morty-next branch which is on hold for the current
>>>> morty QA.
>>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
>>> That's a link for stable/pyro-next.
>>> The change doesn't seem to be in stable/morty-next though:
>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stable/morty-next
>> Is there anything from my side that needs to be done for this patch?
> Nope. I have it in the stable/moryt mut branch and trying to address
> build issues.
Is there anything we can do to help with that? The delta between morty
and stable/morty-nmut is only 6 patches (and only 5 between morty and
stable/morty-mnut), so if these changes introduced the build issue it
should be relatively easy to track down.
89940cc libnl: fix CVE-2017-0553
dc6a0c4 staging.bbclass: use single quotes for path passed to file in is_elf()
bd2fd02 package.bbclass: Add '-b' option to file call in isELF
39c8e98 package.bbclass: use single quotes for path passed to file in isELF()
8a1b2b8 gdb: fix header ordering for TRAP_HWBKPT
c944c71 glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
2018-06-26 22:54 ` Andre McCurdy
@ 2018-06-26 23:10 ` akuster808
0 siblings, 0 replies; 11+ messages in thread
From: akuster808 @ 2018-06-26 23:10 UTC (permalink / raw)
To: Andre McCurdy; +Cc: Patches and discussions about the oe-core layer
On 06/26/2018 03:54 PM, Andre McCurdy wrote:
> On Tue, Jun 26, 2018 at 3:33 PM, akuster808 <akuster808@gmail.com> wrote:
>> On 06/18/2018 12:20 PM, Daniel Díaz wrote:
>>> On 11 June 2018 at 16:46, Andre McCurdy <armccurdy@gmail.com> wrote:
>>>> On Mon, Jun 11, 2018 at 2:38 PM, akuster808 <akuster808@gmail.com> wrote:
>>>>> On 06/11/2018 10:30 AM, Daniel Díaz wrote:
>>>>>> Ping on this series for Morty.
>>>>> this is in the stable/morty-next branch which is on hold for the current
>>>>> morty QA.
>>>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/pyro-next&id=76ffc6b7e5ff6f2bab6e53bb07f52a25fcb81ac9
>>>> That's a link for stable/pyro-next.
>>>> The change doesn't seem to be in stable/morty-next though:
>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stable/morty-next
>>> Is there anything from my side that needs to be done for this patch?
>> Nope. I have it in the stable/moryt mut branch and trying to address
>> build issues.
> Is there anything we can do to help with that?
Too early to know. thanks for the offer. This is my first opportunity to
re-run morty-nmut.
> The delta between morty
> and stable/morty-nmut is only 6 patches (and only 5 between morty and
> stable/morty-mnut), so if these changes introduced the build issue it
> should be relatively easy to track down.
its not always the patches. we have newer OS to deal with, build burps etc.
I know later today how it goes.
regards,
Armin
>
> 89940cc libnl: fix CVE-2017-0553
> dc6a0c4 staging.bbclass: use single quotes for path passed to file in is_elf()
> bd2fd02 package.bbclass: Add '-b' option to file call in isELF
> 39c8e98 package.bbclass: use single quotes for path passed to file in isELF()
> 8a1b2b8 gdb: fix header ordering for TRAP_HWBKPT
> c944c71 glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
^ permalink raw reply [flat|nested] 11+ messages in thread
* [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions
@ 2018-03-13 16:17 Daniel Díaz
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Díaz @ 2018-03-13 16:17 UTC (permalink / raw)
To: openembedded-core
From: Fathi Boudra <fathi.boudra@linaro.org>
Patch submitted upstream, pending to be merged:
https://sourceware.org/bugzilla/show_bug.cgi?id=21286
(From OE-Core rev: 11ebb5054e5ec1171ade90249e3a30ac8174a35a)
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
...o.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch | 69 ++++++++++++++++++++++
meta/recipes-core/glibc/glibc_2.24.bb | 1 +
2 files changed, 70 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
diff --git a/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch b/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
new file mode 100644
index 0000000..fe22cc3
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch
@@ -0,0 +1,69 @@
+From af3054b3856379d353a779801678f330e1b58c9a Mon Sep 17 00:00:00 2001
+Message-Id: <af3054b3856379d353a779801678f330e1b58c9a.1490183611.git.panand@redhat.com>
+From: Pratyush Anand <panand@redhat.com>
+Date: Wed, 22 Mar 2017 17:02:38 +0530
+Subject: [PATCH] bits/siginfo.h: enum definition for TRAP_HWBKPT is missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compile following linux kernel test code with latest glibc:
+
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
+
+and we get following error:
+breakpoint_test_arm64.c: In function ‘run_test’:
+breakpoint_test_arm64.c:171:25: error: ‘TRAP_HWBKPT’ undeclared (first use in this function)
+ if (siginfo.si_code != TRAP_HWBKPT) {
+ ^
+I can compile test code by modifying my local
+/usr/include/bits/siginfo.h and test works great. Therefore, this patch
+will be needed in upstream glibc so that issue is fixed there as well.
+
+Signed-off-by: Pratyush Anand <panand@redhat.com>
+
+Upstream-Status : Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=21286]
+---
+ bits/siginfo.h | 6 +++++-
+ sysdeps/unix/sysv/linux/bits/siginfo.h | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/bits/siginfo.h b/bits/siginfo.h
+index 4919df543634..6dc714e8f30b 100644
+--- a/bits/siginfo.h
++++ b/bits/siginfo.h
+@@ -140,8 +140,12 @@ enum
+ {
+ TRAP_BRKPT = 1, /* Process breakpoint. */
+ # define TRAP_BRKPT TRAP_BRKPT
+- TRAP_TRACE /* Process trace trap. */
++ TRAP_TRACE, /* Process trace trap. */
+ # define TRAP_TRACE TRAP_TRACE
++ TRAP_BRANCH, /* Process branch trap. */
++# define TRAP_BRANCH TRAP_BRANCH
++ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
++# define TRAP_HWBKPT TRAP_HWBKPT
+ };
+ # endif
+
+diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h
+index 7b0d4f62a331..9cdf42a42557 100644
+--- a/sysdeps/unix/sysv/linux/bits/siginfo.h
++++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
+@@ -235,8 +235,12 @@ enum
+ {
+ TRAP_BRKPT = 1, /* Process breakpoint. */
+ # define TRAP_BRKPT TRAP_BRKPT
+- TRAP_TRACE /* Process trace trap. */
++ TRAP_TRACE, /* Process trace trap. */
+ # define TRAP_TRACE TRAP_TRACE
++ TRAP_BRANCH, /* Process branch trap. */
++# define TRAP_BRANCH TRAP_BRANCH
++ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
++# define TRAP_HWBKPT TRAP_HWBKPT
+ };
+ # endif
+
+--
+2.9.3
+
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb
index 6ea4585..09694f2 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -38,6 +38,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
file://0026-build_local_scope.patch \
file://0028-Bug-20116-Fix-use-after-free-in-pthread_create.patch \
+ file://0029-bits-siginfo.h-enum-definition-for-TRAP_HWBKPT-is-mi.patch \
file://CVE-2016-6323.patch \
file://0001-Add-atomic_exchange_relaxed.patch \
file://0002-Add-atomic-operations-required-by-the-new-condition-.patch \
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-06-26 23:10 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-06 17:08 [morty][PATCH 1/2] glibc: add missing TRAP_BRANCH/TRAP_HWBKPT definitions Daniel Díaz Rodríguez
2018-04-06 20:43 ` akuster808
2018-05-16 21:20 ` Daniel Díaz
2018-06-11 17:30 ` Daniel Díaz
2018-06-11 21:38 ` akuster808
2018-06-11 21:46 ` Andre McCurdy
2018-06-18 19:20 ` Daniel Díaz
2018-06-26 22:33 ` akuster808
2018-06-26 22:54 ` Andre McCurdy
2018-06-26 23:10 ` akuster808
-- strict thread matches above, loose matches on Subject: below --
2018-03-13 16:17 Daniel Díaz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.