summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:46:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commit3c3505d588c3e2e04dcaf633771570bad11cb2da (patch)
tree431f68152d1ea9ad030dd7cefa253a467c068d40
parentda839dce3aed92a6ce6e097aa5a9981409f234f6 (diff)
downloadpoky-3c3505d588c3e2e04dcaf633771570bad11cb2da.tar.gz
elfutils: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 2526fcfac8e360d5d27f5ebe26608df470b3b84b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff46
1 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff b/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
index 44fda7f305..56f852a414 100644
--- a/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
@@ -1,10 +1,10 @@
1Upstream-Status: Backport [from debian] 1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3 3
4Index: b/backends/parisc_init.c 4Index: elfutils-0.170/backends/parisc_init.c
5=================================================================== 5===================================================================
6--- /dev/null 6--- /dev/null
7+++ b/backends/parisc_init.c 7+++ elfutils-0.170/backends/parisc_init.c
8@@ -0,0 +1,73 @@ 8@@ -0,0 +1,73 @@
9+/* Initialization of PA-RISC specific backend library. 9+/* Initialization of PA-RISC specific backend library.
10+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc. 10+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc.
@@ -79,10 +79,10 @@ Index: b/backends/parisc_init.c
79+ 79+
80+ return MODVERSION; 80+ return MODVERSION;
81+} 81+}
82Index: b/backends/parisc_regs.c 82Index: elfutils-0.170/backends/parisc_regs.c
83=================================================================== 83===================================================================
84--- /dev/null 84--- /dev/null
85+++ b/backends/parisc_regs.c 85+++ elfutils-0.170/backends/parisc_regs.c
86@@ -0,0 +1,159 @@ 86@@ -0,0 +1,159 @@
87+/* Register names and numbers for PA-RISC DWARF. 87+/* Register names and numbers for PA-RISC DWARF.
88+ Copyright (C) 2005, 2006 Red Hat, Inc. 88+ Copyright (C) 2005, 2006 Red Hat, Inc.
@@ -243,10 +243,10 @@ Index: b/backends/parisc_regs.c
243+ name[namelen++] = '\0'; 243+ name[namelen++] = '\0';
244+ return namelen; 244+ return namelen;
245+} 245+}
246Index: b/backends/parisc_reloc.def 246Index: elfutils-0.170/backends/parisc_reloc.def
247=================================================================== 247===================================================================
248--- /dev/null 248--- /dev/null
249+++ b/backends/parisc_reloc.def 249+++ elfutils-0.170/backends/parisc_reloc.def
250@@ -0,0 +1,128 @@ 250@@ -0,0 +1,128 @@
251+/* List the relocation types for PA-RISC. -*- C -*- 251+/* List the relocation types for PA-RISC. -*- C -*-
252+ Copyright (C) 2005 Red Hat, Inc. 252+ Copyright (C) 2005 Red Hat, Inc.
@@ -376,10 +376,10 @@ Index: b/backends/parisc_reloc.def
376+RELOC_TYPE (TLS_DTPMOD64, DYN) 376+RELOC_TYPE (TLS_DTPMOD64, DYN)
377+ 377+
378+#define NO_RELATIVE_RELOC 1 378+#define NO_RELATIVE_RELOC 1
379Index: b/backends/parisc_retval.c 379Index: elfutils-0.170/backends/parisc_retval.c
380=================================================================== 380===================================================================
381--- /dev/null 381--- /dev/null
382+++ b/backends/parisc_retval.c 382+++ elfutils-0.170/backends/parisc_retval.c
383@@ -0,0 +1,213 @@ 383@@ -0,0 +1,213 @@
384+/* Function return value location for Linux/PA-RISC ABI. 384+/* Function return value location for Linux/PA-RISC ABI.
385+ Copyright (C) 2005 Red Hat, Inc. 385+ Copyright (C) 2005 Red Hat, Inc.
@@ -594,10 +594,10 @@ Index: b/backends/parisc_retval.c
594+ return parisc_return_value_location_ (functypedie, locp, 1); 594+ return parisc_return_value_location_ (functypedie, locp, 1);
595+} 595+}
596+ 596+
597Index: b/backends/parisc_symbol.c 597Index: elfutils-0.170/backends/parisc_symbol.c
598=================================================================== 598===================================================================
599--- /dev/null 599--- /dev/null
600+++ b/backends/parisc_symbol.c 600+++ elfutils-0.170/backends/parisc_symbol.c
601@@ -0,0 +1,112 @@ 601@@ -0,0 +1,112 @@
602+/* PA-RISC specific symbolic name handling. 602+/* PA-RISC specific symbolic name handling.
603+ Copyright (C) 2002, 2005 Red Hat, Inc. 603+ Copyright (C) 2002, 2005 Red Hat, Inc.
@@ -711,10 +711,10 @@ Index: b/backends/parisc_symbol.c
711+ return ELF_T_NUM; 711+ return ELF_T_NUM;
712+ } 712+ }
713+} 713+}
714Index: b/backends/libebl_parisc.h 714Index: elfutils-0.170/backends/libebl_parisc.h
715=================================================================== 715===================================================================
716--- /dev/null 716--- /dev/null
717+++ b/backends/libebl_parisc.h 717+++ elfutils-0.170/backends/libebl_parisc.h
718@@ -0,0 +1,9 @@ 718@@ -0,0 +1,9 @@
719+#ifndef _LIBEBL_HPPA_H 719+#ifndef _LIBEBL_HPPA_H
720+#define _LIBEBL_HPPA_H 1 720+#define _LIBEBL_HPPA_H 1
@@ -725,10 +725,10 @@ Index: b/backends/libebl_parisc.h
725+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp); 725+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp);
726+ 726+
727+#endif 727+#endif
728Index: b/backends/Makefile.am 728Index: elfutils-0.170/backends/Makefile.am
729=================================================================== 729===================================================================
730--- a/backends/Makefile.am 730--- elfutils-0.170.orig/backends/Makefile.am
731+++ b/backends/Makefile.am 731+++ elfutils-0.170/backends/Makefile.am
732@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I 732@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
733 733
734 734
@@ -744,7 +744,7 @@ Index: b/backends/Makefile.am
744 noinst_LIBRARIES = $(libebl_pic) 744 noinst_LIBRARIES = $(libebl_pic)
745 noinst_DATA = $(libebl_pic:_pic.a=.so) 745 noinst_DATA = $(libebl_pic:_pic.a=.so)
746 746
747@@ -128,6 +128,9 @@ endif 747@@ -124,6 +124,9 @@ cpu_bpf = ../libcpu/libcpu_bpf.a
748 libebl_bpf_pic_a_SOURCES = $(bpf_SRCS) 748 libebl_bpf_pic_a_SOURCES = $(bpf_SRCS)
749 am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os) 749 am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os)
750 750
@@ -752,13 +752,13 @@ Index: b/backends/Makefile.am
752+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) 752+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
753+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) 753+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
754 754
755 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) 755 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu)
756 @rm -f $(@:.so=.map) 756 @rm -f $(@:.so=.map)
757Index: b/libelf/elf.h 757Index: elfutils-0.170/libelf/elf.h
758=================================================================== 758===================================================================
759--- a/libelf/elf.h 759--- elfutils-0.170.orig/libelf/elf.h
760+++ b/libelf/elf.h 760+++ elfutils-0.170/libelf/elf.h
761@@ -2055,16 +2055,24 @@ enum 761@@ -2056,16 +2056,24 @@ enum
762 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ 762 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
763 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ 763 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
764 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ 764 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
@@ -783,7 +783,7 @@ Index: b/libelf/elf.h
783 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ 783 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
784 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ 784 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
785 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ 785 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
786@@ -2073,6 +2081,7 @@ enum 786@@ -2074,6 +2082,7 @@ enum
787 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ 787 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */
788 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ 788 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */
789 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ 789 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
@@ -791,7 +791,7 @@ Index: b/libelf/elf.h
791 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ 791 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
792 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ 792 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
793 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ 793 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
794@@ -2098,6 +2107,8 @@ enum 794@@ -2099,6 +2108,8 @@ enum
795 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ 795 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
796 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ 796 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
797 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ 797 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */