mirror of
https://git.yoctoproject.org/poky
synced 2026-04-07 14:02:22 +02:00
libunwind: 1.2 -> 1.2.1
1.Upgrade libunwind from 1.2 to 1.2.1. 2.Delete fix-mips.patch, since it is integrated upstream. (From OE-Core rev: a8944a706dc5acd9dc091d60675c0dbc50294df7) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Huang Qiyu
committed by
Richard Purdie
Richard Purdie
parent
9bd7375e11
commit
683387a676
@@ -1,134 +0,0 @@
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 5f354cb7b9c84dae006f0ebd8ad7a78d7e2aad0c Mon Sep 17 00:00:00 2001
|
||||
From: Dave Watson <davejwatson@fb.com>
|
||||
Date: Wed, 25 Jan 2017 16:18:02 -0800
|
||||
Subject: [PATCH] mips/tilegx: Add missing unwind_i.h header file
|
||||
|
||||
reported-by: John Knight <John.Knight@belkin.com>
|
||||
---
|
||||
src/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 5d874755..7de4c425 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -280,7 +280,7 @@ libunwind_hppa_la_SOURCES_hppa = $(libunwind_la_SOURCES_hppa_common) \
|
||||
hppa/Gresume.c hppa/Gstep.c
|
||||
|
||||
# The list of files that go info libunwind and libunwind-mips:
|
||||
-noinst_HEADERS += mips/init.h mips/offsets.h
|
||||
+noinst_HEADERS += mips/init.h mips/offsets.h mips/unwind_i.h
|
||||
libunwind_la_SOURCES_mips_common = $(libunwind_la_SOURCES_common) \
|
||||
mips/is_fpreg.c mips/regname.c
|
||||
|
||||
@@ -299,7 +299,7 @@ libunwind_mips_la_SOURCES_mips = $(libunwind_la_SOURCES_mips_common) \
|
||||
mips/Gis_signal_frame.c mips/Gregs.c mips/Gresume.c mips/Gstep.c
|
||||
|
||||
# The list of files that go info libunwind and libunwind-tilegx:
|
||||
-noinst_HEADERS += tilegx/init.h tilegx/offsets.h
|
||||
+noinst_HEADERS += tilegx/init.h tilegx/offsets.h tilegx/unwind_i.h
|
||||
libunwind_la_SOURCES_tilegx_common = $(libunwind_la_SOURCES_common) \
|
||||
tilegx/is_fpreg.c tilegx/regname.c
|
||||
|
||||
diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h
|
||||
new file mode 100644
|
||||
index 0000000..3382dcf
|
||||
--- /dev/null
|
||||
+++ b/src/mips/unwind_i.h
|
||||
@@ -0,0 +1,43 @@
|
||||
+/* libunwind - a platform-independent unwind library
|
||||
+ Copyright (C) 2008 CodeSourcery
|
||||
+
|
||||
+This file is part of libunwind.
|
||||
+
|
||||
+Permission is hereby granted, free of charge, to any person obtaining
|
||||
+a copy of this software and associated documentation files (the
|
||||
+"Software"), to deal in the Software without restriction, including
|
||||
+without limitation the rights to use, copy, modify, merge, publish,
|
||||
+distribute, sublicense, and/or sell copies of the Software, and to
|
||||
+permit persons to whom the Software is furnished to do so, subject to
|
||||
+the following conditions:
|
||||
+
|
||||
+The above copyright notice and this permission notice shall be
|
||||
+included in all copies or substantial portions of the Software.
|
||||
+
|
||||
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
+
|
||||
+#ifndef unwind_i_h
|
||||
+#define unwind_i_h
|
||||
+
|
||||
+#include <stdint.h>
|
||||
+
|
||||
+#include <libunwind-mips.h>
|
||||
+
|
||||
+#include "libunwind_i.h"
|
||||
+
|
||||
+#define mips_lock UNW_OBJ(lock)
|
||||
+#define mips_local_resume UNW_OBJ(local_resume)
|
||||
+#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init)
|
||||
+
|
||||
+extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor,
|
||||
+ void *arg);
|
||||
+
|
||||
+extern void mips_local_addr_space_init (void);
|
||||
+
|
||||
+#endif /* unwind_i_h */
|
||||
diff --git a/src/tilegx/unwind_i.h b/src/tilegx/unwind_i.h
|
||||
new file mode 100644
|
||||
index 0000000..aac7be3
|
||||
--- /dev/null
|
||||
+++ b/src/tilegx/unwind_i.h
|
||||
@@ -0,0 +1,44 @@
|
||||
+/* libunwind - a platform-independent unwind library
|
||||
+ Copyright (C) 2008 CodeSourcery
|
||||
+
|
||||
+This file is part of libunwind.
|
||||
+
|
||||
+Permission is hereby granted, free of charge, to any person obtaining
|
||||
+a copy of this software and associated documentation files (the
|
||||
+"Software"), to deal in the Software without restriction, including
|
||||
+without limitation the rights to use, copy, modify, merge, publish,
|
||||
+distribute, sublicense, and/or sell copies of the Software, and to
|
||||
+permit persons to whom the Software is furnished to do so, subject to
|
||||
+the following conditions:
|
||||
+
|
||||
+The above copyright notice and this permission notice shall be
|
||||
+included in all copies or substantial portions of the Software.
|
||||
+
|
||||
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
+
|
||||
+#ifndef unwind_i_h
|
||||
+#define unwind_i_h
|
||||
+
|
||||
+#include <memory.h>
|
||||
+#include <stdint.h>
|
||||
+
|
||||
+#include <libunwind-tilegx.h>
|
||||
+
|
||||
+#include "libunwind_i.h"
|
||||
+
|
||||
+#define tilegx_local_resume UNW_OBJ(local_resume)
|
||||
+#define tilegx_local_addr_space_init UNW_OBJ(local_addr_space_init)
|
||||
+
|
||||
+extern int tilegx_local_resume (unw_addr_space_t as,
|
||||
+ unw_cursor_t *cursor,
|
||||
+ void *arg);
|
||||
+
|
||||
+extern void tilegx_local_addr_space_init (void);
|
||||
+
|
||||
+#endif /* unwind_i_h */
|
||||
@@ -1,7 +1,7 @@
|
||||
require libunwind.inc
|
||||
|
||||
SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f"
|
||||
SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992"
|
||||
SRC_URI[md5sum] = "06ba9e60d92fd6f55cd9dadb084df19e"
|
||||
SRC_URI[sha256sum] = "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb"
|
||||
|
||||
SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \
|
||||
file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \
|
||||
@@ -11,7 +11,6 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
|
||||
file://0001-add-knobs-to-disable-enable-tests.patch \
|
||||
file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \
|
||||
file://libunwind-1.1-x32.patch \
|
||||
file://fix-mips.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
|
||||
Reference in New Issue
Block a user