summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-07-22 16:58:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-29 13:08:59 +0100
commit4b5a21d86759be735721df7b86b6fb79e5ff2ffc (patch)
treedc82ca065734547495735883ecbcc3f604c8d568
parenta55fa3c8ddd07c69e3b1efac5e9f0eee4a2a9388 (diff)
downloadpoky-4b5a21d86759be735721df7b86b6fb79e5ff2ffc.tar.gz
elfutils: fix backends' Makefile.am
The mips, m68k and parisc backend libraries were not generated. This patch fixes that. [YOCTO #4849] (From OE-Core rev: d79521cf1777276a5e85d59f9e078f4d6d9603aa) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff15
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff12
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff16
3 files changed, 30 insertions, 13 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff
index e8d8df5b2a..3fb25230ed 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff
@@ -729,7 +729,7 @@ Index: elfutils-0.155/backends/Makefile.am
729=================================================================== 729===================================================================
730--- elfutils-0.155.orig/backends/Makefile.am 730--- elfutils-0.155.orig/backends/Makefile.am
731+++ elfutils-0.155/backends/Makefile.am 731+++ elfutils-0.155/backends/Makefile.am
732@@ -32,7 +32,7 @@ INCLUDES += -I$(top_srcdir)/libebl -I$(t 732@@ -32,11 +32,11 @@
733 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw 733 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
734 734
735 735
@@ -738,7 +738,12 @@ Index: elfutils-0.155/backends/Makefile.am
738 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 738 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
739 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 739 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
740 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ 740 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \
741@@ -103,6 +103,9 @@ tilegx_SRCS = tilegx_init.c tilegx_symbo 741- libebl_s390_pic.a libebl_tilegx_pic.a
742+ libebl_s390_pic.a libebl_tilegx_pic.a libebl_parisc_pic.a
743 noinst_LIBRARIES = $(libebl_pic)
744 noinst_DATA = $(libebl_pic:_pic.a=.so)
745
746@@ -103,6 +103,9 @@
742 libebl_tilegx_pic_a_SOURCES = $(tilegx_SRCS) 747 libebl_tilegx_pic_a_SOURCES = $(tilegx_SRCS)
743 am_libebl_tilegx_pic_a_OBJECTS = $(tilegx_SRCS:.c=.os) 748 am_libebl_tilegx_pic_a_OBJECTS = $(tilegx_SRCS:.c=.os)
744 749
@@ -752,7 +757,7 @@ Index: elfutils-0.155/libelf/elf.h
752=================================================================== 757===================================================================
753--- elfutils-0.155.orig/libelf/elf.h 758--- elfutils-0.155.orig/libelf/elf.h
754+++ elfutils-0.155/libelf/elf.h 759+++ elfutils-0.155/libelf/elf.h
755@@ -1780,16 +1780,24 @@ typedef Elf32_Addr Elf32_Conflict; 760@@ -1780,16 +1780,24 @@
756 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ 761 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
757 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ 762 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
758 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ 763 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
@@ -777,7 +782,7 @@ Index: elfutils-0.155/libelf/elf.h
777 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ 782 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
778 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ 783 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
779 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ 784 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
780@@ -1798,6 +1806,7 @@ typedef Elf32_Addr Elf32_Conflict; 785@@ -1798,6 +1806,7 @@
781 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ 786 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */
782 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ 787 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */
783 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ 788 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
@@ -785,7 +790,7 @@ Index: elfutils-0.155/libelf/elf.h
785 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ 790 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
786 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ 791 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
787 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ 792 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
788@@ -1823,6 +1832,8 @@ typedef Elf32_Addr Elf32_Conflict; 793@@ -1823,6 +1832,8 @@
789 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ 794 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
790 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ 795 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
791 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ 796 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff
index e9b5c402eb..79a8f0e437 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff
@@ -219,7 +219,7 @@ Index: elfutils-0.155/libelf/elf.h
219=================================================================== 219===================================================================
220--- elfutils-0.155.orig/libelf/elf.h 220--- elfutils-0.155.orig/libelf/elf.h
221+++ elfutils-0.155/libelf/elf.h 221+++ elfutils-0.155/libelf/elf.h
222@@ -1126,6 +1126,9 @@ typedef struct 222@@ -1126,6 +1126,9 @@
223 #define R_68K_GLOB_DAT 20 /* Create GOT entry */ 223 #define R_68K_GLOB_DAT 20 /* Create GOT entry */
224 #define R_68K_JMP_SLOT 21 /* Create PLT entry */ 224 #define R_68K_JMP_SLOT 21 /* Create PLT entry */
225 #define R_68K_RELATIVE 22 /* Adjust by program base */ 225 #define R_68K_RELATIVE 22 /* Adjust by program base */
@@ -233,7 +233,7 @@ Index: elfutils-0.155/backends/Makefile.am
233=================================================================== 233===================================================================
234--- elfutils-0.155.orig/backends/Makefile.am 234--- elfutils-0.155.orig/backends/Makefile.am
235+++ elfutils-0.155/backends/Makefile.am 235+++ elfutils-0.155/backends/Makefile.am
236@@ -32,7 +32,7 @@ INCLUDES += -I$(top_srcdir)/libebl -I$(t 236@@ -32,12 +32,12 @@
237 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw 237 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
238 238
239 239
@@ -242,7 +242,13 @@ Index: elfutils-0.155/backends/Makefile.am
242 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 242 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
243 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 243 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
244 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ 244 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \
245@@ -111,6 +111,10 @@ mips_SRCS = mips_init.c mips_symbol.c mi 245 libebl_s390_pic.a libebl_tilegx_pic.a libebl_parisc_pic.a \
246- libebl_mips_pic.a
247+ libebl_mips_pic.a libebl_m68k_pic.a
248 noinst_LIBRARIES = $(libebl_pic)
249 noinst_DATA = $(libebl_pic:_pic.a=.so)
250
251@@ -112,6 +112,10 @@
246 libebl_mips_pic_a_SOURCES = $(mips_SRCS) 252 libebl_mips_pic_a_SOURCES = $(mips_SRCS)
247 am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) 253 am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os)
248 254
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff
index 8e07c33614..8fc06c50fb 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff
@@ -645,7 +645,7 @@ Index: elfutils-0.155/libebl/eblopenbackend.c
645=================================================================== 645===================================================================
646--- elfutils-0.155.orig/libebl/eblopenbackend.c 646--- elfutils-0.155.orig/libebl/eblopenbackend.c
647+++ elfutils-0.155/libebl/eblopenbackend.c 647+++ elfutils-0.155/libebl/eblopenbackend.c
648@@ -71,6 +71,8 @@ static const struct 648@@ -71,6 +71,8 @@
649 { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 }, 649 { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
650 { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 }, 650 { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
651 { "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 }, 651 { "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 },
@@ -658,7 +658,7 @@ Index: elfutils-0.155/backends/common-reloc.c
658=================================================================== 658===================================================================
659--- elfutils-0.155.orig/backends/common-reloc.c 659--- elfutils-0.155.orig/backends/common-reloc.c
660+++ elfutils-0.155/backends/common-reloc.c 660+++ elfutils-0.155/backends/common-reloc.c
661@@ -112,11 +112,13 @@ EBLHOOK(reloc_valid_use) (Elf *elf, int 661@@ -112,11 +112,13 @@
662 } 662 }
663 663
664 664
@@ -672,7 +672,7 @@ Index: elfutils-0.155/backends/common-reloc.c
672 672
673 bool 673 bool
674 EBLHOOK(none_reloc_p) (int reloc) 674 EBLHOOK(none_reloc_p) (int reloc)
675@@ -138,7 +140,9 @@ EBLHOOK(init_reloc) (Ebl *ebl) 675@@ -138,7 +140,9 @@
676 ebl->reloc_type_name = EBLHOOK(reloc_type_name); 676 ebl->reloc_type_name = EBLHOOK(reloc_type_name);
677 ebl->reloc_type_check = EBLHOOK(reloc_type_check); 677 ebl->reloc_type_check = EBLHOOK(reloc_type_check);
678 ebl->reloc_valid_use = EBLHOOK(reloc_valid_use); 678 ebl->reloc_valid_use = EBLHOOK(reloc_valid_use);
@@ -686,7 +686,7 @@ Index: elfutils-0.155/backends/Makefile.am
686=================================================================== 686===================================================================
687--- elfutils-0.155.orig/backends/Makefile.am 687--- elfutils-0.155.orig/backends/Makefile.am
688+++ elfutils-0.155/backends/Makefile.am 688+++ elfutils-0.155/backends/Makefile.am
689@@ -32,7 +32,7 @@ INCLUDES += -I$(top_srcdir)/libebl -I$(t 689@@ -32,11 +32,12 @@
690 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw 690 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
691 691
692 692
@@ -695,7 +695,13 @@ Index: elfutils-0.155/backends/Makefile.am
695 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 695 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
696 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 696 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
697 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ 697 libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \
698@@ -107,6 +107,10 @@ parisc_SRCS = parisc_init.c parisc_symbo 698- libebl_s390_pic.a libebl_tilegx_pic.a libebl_parisc_pic.a
699+ libebl_s390_pic.a libebl_tilegx_pic.a libebl_parisc_pic.a \
700+ libebl_mips_pic.a
701 noinst_LIBRARIES = $(libebl_pic)
702 noinst_DATA = $(libebl_pic:_pic.a=.so)
703
704@@ -107,6 +108,10 @@
699 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) 705 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
700 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) 706 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
701 707