diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils/files')
10 files changed, 0 insertions, 448 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch b/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch deleted file mode 100644 index d4e141927f..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From e169c3fc734be1783b3e1a4768dbec05fb64cb4f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Fri, 22 Nov 2024 12:50:48 +0100 | ||
| 4 | Subject: [PATCH] config/eu.am: do not force -Werror | ||
| 5 | |||
| 6 | This is undesirable when compiler versions may not be the same | ||
| 7 | as what upstream is using for their own testing. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 11 | --- | ||
| 12 | config/eu.am | 2 -- | ||
| 13 | 1 file changed, 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/config/eu.am b/config/eu.am | ||
| 16 | index 0b7dab5..5e7a03f 100644 | ||
| 17 | --- a/config/eu.am | ||
| 18 | +++ b/config/eu.am | ||
| 19 | @@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ | ||
| 20 | $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ | ||
| 21 | $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ | ||
| 22 | $(USE_AFTER_FREE3_WARNING) \ | ||
| 23 | - $(if $($(*F)_no_Werror),,-Werror) \ | ||
| 24 | $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ | ||
| 25 | $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ | ||
| 26 | $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ | ||
| 27 | @@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ | ||
| 28 | $(TRAMPOLINES_WARNING) \ | ||
| 29 | $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ | ||
| 30 | $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ | ||
| 31 | - $(if $($(*F)_no_Werror),,-Werror) \ | ||
| 32 | $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ | ||
| 33 | $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ | ||
| 34 | $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ | ||
diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch deleted file mode 100644 index 81c5255447..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From f5d6e088f84dd05278c4698a21cbf1ff4569978d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mark Wielaard <mark@klomp.org> | ||
| 3 | Date: Tue, 22 Oct 2024 15:03:42 +0200 | ||
| 4 | Subject: [PATCH] libelf: Add libeu objects to libelf.a static archive | ||
| 5 | |||
| 6 | libelf might use some symbols from libeu.a, specifically the eu-search | ||
| 7 | wrappers. But we don't ship libeu.a separately. So include the libeu | ||
| 8 | objects in the libelf.a archive to facilitate static linking. | ||
| 9 | |||
| 10 | * libelf/Makefile.am (libeu_objects): New variable. | ||
| 11 | (libelf_a_LIBADD): New, add libeu_objects. | ||
| 12 | |||
| 13 | https://sourceware.org/bugzilla/show_bug.cgi?id=32293 | ||
| 14 | |||
| 15 | Signed-off-by: Mark Wielaard <mark@klomp.org> | ||
| 16 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 17 | Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=f5d6e088f84dd05278c4698a21cbf1ff4569978d] | ||
| 18 | --- | ||
| 19 | libelf/Makefile.am | 3 +++ | ||
| 20 | 1 file changed, 3 insertions(+) | ||
| 21 | |||
| 22 | diff --git a/libelf/Makefile.am b/libelf/Makefile.am | ||
| 23 | index 05484c1..72f1e22 100644 | ||
| 24 | --- a/libelf/Makefile.am | ||
| 25 | +++ b/libelf/Makefile.am | ||
| 26 | @@ -125,6 +125,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) | ||
| 27 | libeu_objects = $(shell cat ../lib/libeu.manifest) | ||
| 28 | libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) | ||
| 29 | |||
| 30 | +libeu_objects = $(shell $(AR) t ../lib/libeu.a) | ||
| 31 | +libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) | ||
| 32 | + | ||
| 33 | install: install-am libelf.so | ||
| 34 | $(mkinstalldirs) $(DESTDIR)$(libdir) | ||
| 35 | $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so | ||
diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch deleted file mode 100644 index 1ee50588dc..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From c4a26ff38182b289a1076bbef263e808b5e3aa97 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Thu, 16 Aug 2018 09:58:26 +0800 | ||
| 4 | Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it | ||
| 5 | |||
| 6 | The one which actually saves the data is data_list.data.d.d_buf, so check it | ||
| 7 | before free rawdata_base. | ||
| 8 | |||
| 9 | This can fix a segmentation fault when prelink libqb_1.0.3: | ||
| 10 | prelink: /usr/lib/libqb.so.0.18.2: Symbol section index outside of section numbers | ||
| 11 | |||
| 12 | The segmentation fault happens when prelink call elf_end(). | ||
| 13 | |||
| 14 | Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2018-q3/msg00085.html] | ||
| 15 | |||
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 17 | --- | ||
| 18 | libelf/elf_end.c | 6 ++++-- | ||
| 19 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/libelf/elf_end.c b/libelf/elf_end.c | ||
| 22 | index da8f3a2..8557658 100644 | ||
| 23 | --- a/libelf/elf_end.c | ||
| 24 | +++ b/libelf/elf_end.c | ||
| 25 | @@ -170,14 +170,16 @@ elf_end (Elf *elf) | ||
| 26 | architecture doesn't require overly stringent | ||
| 27 | alignment the raw data buffer is the same as the | ||
| 28 | one used for presenting to the caller. */ | ||
| 29 | - if (scn->data_base != scn->rawdata_base) | ||
| 30 | + if ((scn->data_base != scn->rawdata_base) | ||
| 31 | + && (scn->data_list.data.d.d_buf != NULL)) | ||
| 32 | free (scn->data_base); | ||
| 33 | |||
| 34 | /* The section data is allocated if we couldn't mmap | ||
| 35 | the file. Or if we had to decompress. */ | ||
| 36 | - if (elf->map_address == NULL | ||
| 37 | + if ((elf->map_address == NULL | ||
| 38 | || scn->rawdata_base == scn->zdata_base | ||
| 39 | || (scn->flags & ELF_F_MALLOCED) != 0) | ||
| 40 | + && (scn->data_list.data.d.d_buf != NULL)) | ||
| 41 | free (scn->rawdata_base); | ||
| 42 | |||
| 43 | /* Free the list of data buffers for the section. | ||
diff --git a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch deleted file mode 100644 index 2fc526372d..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From d59d6fd13e4a7fe3fdca2a4ce1cd2def36356bb4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
| 3 | Date: Tue, 21 May 2019 15:20:34 +0800 | ||
| 4 | Subject: [PATCH] skip the test when gcc not deployed | ||
| 5 | |||
| 6 | Skip the tests which depend on gcc when | ||
| 7 | gcc not deployed. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html] | ||
| 10 | |||
| 11 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
| 12 | --- | ||
| 13 | tests/run-disasm-x86-64.sh | 2 ++ | ||
| 14 | tests/run-disasm-x86.sh | 2 ++ | ||
| 15 | tests/run-strip-g.sh | 2 ++ | ||
| 16 | tests/run-strip-nothing.sh | 2 ++ | ||
| 17 | 4 files changed, 8 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/tests/run-disasm-x86-64.sh b/tests/run-disasm-x86-64.sh | ||
| 20 | index 07b612b..7a32996 100755 | ||
| 21 | --- a/tests/run-disasm-x86-64.sh | ||
| 22 | +++ b/tests/run-disasm-x86-64.sh | ||
| 23 | @@ -22,6 +22,8 @@ case "`uname -m`" in | ||
| 24 | x86_64) | ||
| 25 | tempfiles testfile45.o | ||
| 26 | testfiles testfile45.S testfile45.expect | ||
| 27 | + # skip the case if no gcc deployed | ||
| 28 | + which gcc || exit 77 | ||
| 29 | ${CC} -m64 -c -o testfile45.o testfile45.S | ||
| 30 | testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect | ||
| 31 | ;; | ||
| 32 | diff --git a/tests/run-disasm-x86.sh b/tests/run-disasm-x86.sh | ||
| 33 | index 7ac73ad..f0d4796 100755 | ||
| 34 | --- a/tests/run-disasm-x86.sh | ||
| 35 | +++ b/tests/run-disasm-x86.sh | ||
| 36 | @@ -22,6 +22,8 @@ case "`uname -m`" in | ||
| 37 | x86_64 | i?86 ) | ||
| 38 | tempfiles testfile44.o | ||
| 39 | testfiles testfile44.S testfile44.expect | ||
| 40 | + # skip the case if no gcc deployed | ||
| 41 | + which gcc || exit 77 | ||
| 42 | ${CC} -m32 -c -o testfile44.o testfile44.S | ||
| 43 | testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect | ||
| 44 | ;; | ||
| 45 | diff --git a/tests/run-strip-g.sh b/tests/run-strip-g.sh | ||
| 46 | index 1592121..9b8157e 100755 | ||
| 47 | --- a/tests/run-strip-g.sh | ||
| 48 | +++ b/tests/run-strip-g.sh | ||
| 49 | @@ -24,6 +24,8 @@ | ||
| 50 | |||
| 51 | tempfiles a.out strip.out debug.out readelf.out | ||
| 52 | |||
| 53 | +# skip the test if gcc deployed | ||
| 54 | +which gcc || exit 77 | ||
| 55 | echo Create debug a.out. | ||
| 56 | echo "int main() { return 1; }" | ${CC} -g -xc - | ||
| 57 | |||
| 58 | diff --git a/tests/run-strip-nothing.sh b/tests/run-strip-nothing.sh | ||
| 59 | index 710c200..3a81d8e 100755 | ||
| 60 | --- a/tests/run-strip-nothing.sh | ||
| 61 | +++ b/tests/run-strip-nothing.sh | ||
| 62 | @@ -22,6 +22,8 @@ | ||
| 63 | |||
| 64 | tempfiles a.out strip.out debug.out | ||
| 65 | |||
| 66 | +# skip the case if no gcc deployed | ||
| 67 | +which gcc || exit 77 | ||
| 68 | # Create no-debug a.out. | ||
| 69 | echo "int main() { return 1; }" | ${CC} -s -xc - | ||
| 70 | |||
diff --git a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch b/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch deleted file mode 100644 index f3790a6d25..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From 34ae914b362c84ff0a96b8936beedb44a2e3f451 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 23 Jun 2020 07:49:35 +0000 | ||
| 4 | Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS | ||
| 5 | |||
| 6 | Otherwise, it will contain build paths in it and wont | ||
| 7 | be reproducible. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 11 | --- | ||
| 12 | tests/Makefile.am | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
| 16 | index eed9bd4..5dd6e05 100644 | ||
| 17 | --- a/tests/Makefile.am | ||
| 18 | +++ b/tests/Makefile.am | ||
| 19 | @@ -104,7 +104,7 @@ endif | ||
| 20 | test-nlist$(EXEEXT): test-nlist.c | ||
| 21 | $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
| 22 | $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
| 23 | - $(test_nlist_CFLAGS) $(GCOV_FLAGS) -o $@ $< $(test_nlist_LDADD) | ||
| 24 | + $(CFLAGS) $(GCOV_FLAGS) -o $@ $< $(test_nlist_LDADD) | ||
| 25 | |||
| 26 | TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \ | ||
| 27 | run-ar-N.sh \ | ||
diff --git a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch deleted file mode 100644 index bf177cce4a..0000000000 --- a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From bd78783254a7126d82eab26a2069b3a457b98e2e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 15 Aug 2017 17:13:59 +0800 | ||
| 4 | Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same. | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | The 'dest' and 'src' can be same, we need to save the value of src32[2] | ||
| 9 | before swaping it. | ||
| 10 | |||
| 11 | Signed-off-by: Baoshan Pang <BaoShan.Pang@windriver.com> | ||
| 12 | |||
| 13 | Rebase to 0.170 | ||
| 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 15 | --- | ||
| 16 | libelf/gnuhash_xlate.h | 3 ++- | ||
| 17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h | ||
| 20 | index 3a00ae0..40468fc 100644 | ||
| 21 | --- a/libelf/gnuhash_xlate.h | ||
| 22 | +++ b/libelf/gnuhash_xlate.h | ||
| 23 | @@ -42,6 +42,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) | ||
| 24 | words. We must detangle them here. */ | ||
| 25 | Elf32_Word *dest32 = dest; | ||
| 26 | const Elf32_Word *src32 = src; | ||
| 27 | + Elf32_Word save_src32_2 = src32[2]; // dest could be equal to src | ||
| 28 | |||
| 29 | /* First four control words, 32 bits. */ | ||
| 30 | for (unsigned int cnt = 0; cnt < 4; ++cnt) | ||
| 31 | @@ -52,7 +53,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) | ||
| 32 | len -= 4; | ||
| 33 | } | ||
| 34 | |||
| 35 | - Elf32_Word bitmask_words = encode ? src32[2] : dest32[2]; | ||
| 36 | + Elf32_Word bitmask_words = encode ? save_src32_2 : dest32[2]; | ||
| 37 | |||
| 38 | /* Now the 64 bit words. */ | ||
| 39 | Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4]; | ||
diff --git a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch deleted file mode 100644 index a539396fd8..0000000000 --- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From da61b483072b7b0bfac1f034ad03972f5104a410 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 15 Aug 2017 17:17:20 +0800 | ||
| 4 | Subject: [PATCH] fixheadercheck | ||
| 5 | |||
| 6 | For some binaries we can get a invalid section alignment, for example if | ||
| 7 | sh_align = 1 and sh_addralign is 0. In the case of a zero size section | ||
| 8 | like | ||
| 9 | ".note.GNU-stack", this is irrelavent as far as I can tell and we | ||
| 10 | shouldn't | ||
| 11 | error in this case. | ||
| 12 | |||
| 13 | RP 2014/6/11 | ||
| 14 | |||
| 15 | Upstream-Status: Pending | ||
| 16 | |||
| 17 | Rebase to 0.170 | ||
| 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 19 | --- | ||
| 20 | libelf/elf32_updatenull.c | 4 ++-- | ||
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c | ||
| 24 | index 3594e8b..a3314e5 100644 | ||
| 25 | --- a/libelf/elf32_updatenull.c | ||
| 26 | +++ b/libelf/elf32_updatenull.c | ||
| 27 | @@ -355,8 +355,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) | ||
| 28 | we test for the alignment of the section being large | ||
| 29 | enough for the largest alignment required by a data | ||
| 30 | block. */ | ||
| 31 | - if (unlikely (! powerof2 (shdr->sh_addralign)) | ||
| 32 | - || unlikely ((shdr->sh_addralign ?: 1) < sh_align)) | ||
| 33 | + if (shdr->sh_size && (unlikely (! powerof2 (shdr->sh_addralign)) | ||
| 34 | + || unlikely ((shdr->sh_addralign ?: 1) < sh_align))) | ||
| 35 | { | ||
| 36 | __libelf_seterrno (ELF_E_INVALID_ALIGN); | ||
| 37 | return -1; | ||
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch deleted file mode 100644 index d8961f6293..0000000000 --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ /dev/null | |||
| @@ -1,95 +0,0 @@ | |||
| 1 | From b1c956cd739f364c4a80381578ddaba43e36903b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Fri, 23 Aug 2019 10:19:48 +0800 | ||
| 4 | Subject: [PATCH] musl-utils | ||
| 5 | |||
| 6 | Provide missing defines which otherwise are available on glibc system headers | ||
| 7 | |||
| 8 | Alter the error API to match posix version | ||
| 9 | use qsort instead of qsort_r which is glibc specific API | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | Upstream-Status: Inappropriate [workaround for musl] | ||
| 13 | |||
| 14 | Rebase to 0.177 | ||
| 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 16 | --- | ||
| 17 | src/arlib.h | 6 ++++++ | ||
| 18 | src/elfcompress.c | 7 +++++++ | ||
| 19 | src/strip.c | 7 +++++++ | ||
| 20 | src/unstrip.c | 9 +++++++++ | ||
| 21 | 4 files changed, 29 insertions(+) | ||
| 22 | |||
| 23 | diff --git a/src/arlib.h b/src/arlib.h | ||
| 24 | index d4a4221..f6336d9 100644 | ||
| 25 | --- a/src/arlib.h | ||
| 26 | +++ b/src/arlib.h | ||
| 27 | @@ -29,6 +29,12 @@ | ||
| 28 | #include <stdint.h> | ||
| 29 | #include <sys/types.h> | ||
| 30 | |||
| 31 | +#if !defined(ALLPERMS) | ||
| 32 | +# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ | ||
| 33 | +#endif | ||
| 34 | +#if !defined(DEFFILEMODE) | ||
| 35 | +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ | ||
| 36 | +#endif | ||
| 37 | |||
| 38 | /* State of -D/-U flags. */ | ||
| 39 | extern bool arlib_deterministic_output; | ||
| 40 | diff --git a/src/elfcompress.c b/src/elfcompress.c | ||
| 41 | index f771b92..263de62 100644 | ||
| 42 | --- a/src/elfcompress.c | ||
| 43 | +++ b/src/elfcompress.c | ||
| 44 | @@ -37,6 +37,13 @@ | ||
| 45 | #include "libeu.h" | ||
| 46 | #include "printversion.h" | ||
| 47 | |||
| 48 | +#if !defined(ALLPERMS) | ||
| 49 | +# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ | ||
| 50 | +#endif | ||
| 51 | +#if !defined(FNM_EXTMATCH) | ||
| 52 | +# define FNM_EXTMATCH (0) | ||
| 53 | +#endif | ||
| 54 | + | ||
| 55 | /* Name and version of program. */ | ||
| 56 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; | ||
| 57 | |||
| 58 | diff --git a/src/strip.c b/src/strip.c | ||
| 59 | index 403e0f6..738e948 100644 | ||
| 60 | --- a/src/strip.c | ||
| 61 | +++ b/src/strip.c | ||
| 62 | @@ -45,6 +45,13 @@ | ||
| 63 | #include <system.h> | ||
| 64 | #include <printversion.h> | ||
| 65 | |||
| 66 | +#if !defined(ACCESSPERMS) | ||
| 67 | +# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ | ||
| 68 | +#endif | ||
| 69 | +#if !defined(FNM_EXTMATCH) | ||
| 70 | +# define FNM_EXTMATCH (0) | ||
| 71 | +#endif | ||
| 72 | + | ||
| 73 | typedef uint8_t GElf_Byte; | ||
| 74 | |||
| 75 | /* Name and version of program. */ | ||
| 76 | diff --git a/src/unstrip.c b/src/unstrip.c | ||
| 77 | index d70053d..b8a6ff3 100644 | ||
| 78 | --- a/src/unstrip.c | ||
| 79 | +++ b/src/unstrip.c | ||
| 80 | @@ -51,6 +51,15 @@ | ||
| 81 | #include "libeu.h" | ||
| 82 | #include "printversion.h" | ||
| 83 | |||
| 84 | +#ifndef strndupa | ||
| 85 | +#define strndupa(s, n) \ | ||
| 86 | + ({const char *__in = (s); \ | ||
| 87 | + size_t __len = strnlen (__in, (n)) + 1; \ | ||
| 88 | + char *__out = (char *) alloca (__len); \ | ||
| 89 | + __out[__len-1] = '\0'; \ | ||
| 90 | + (char *) memcpy (__out, __in, __len-1);}) | ||
| 91 | +#endif | ||
| 92 | + | ||
| 93 | /* Name and version of program. */ | ||
| 94 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; | ||
| 95 | |||
diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch deleted file mode 100644 index 6b83fa4662..0000000000 --- a/meta/recipes-devtools/elfutils/files/ptest.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From 74dad3295f2b8dc06b7e6bb876bc4541e927ef47 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Wed, 1 May 2019 16:37:48 +0100 | ||
| 4 | Subject: [PATCH] Changes to allow ptest to run standalone on target: | ||
| 5 | |||
| 6 | a) Run the tests serially | ||
| 7 | b) Use the standalone test mode which allows the tests to be run in their | ||
| 8 | 'installled' locations on target (but not any of the standalone build pieces) | ||
| 9 | c) We want to use the binaries from their installed locations so the run-subr | ||
| 10 | script needs tweaking to run them like that. The rpath conditional isn't | ||
| 11 | enough since we want the second entry in the case statement. | ||
| 12 | d) Add an oecheck make target which we can use to build the test binaries we need | ||
| 13 | |||
| 14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 15 | |||
| 16 | Upstream-Status: Inappropriate [oe specific] | ||
| 17 | --- | ||
| 18 | configure.ac | 2 +- | ||
| 19 | tests/Makefile.am | 2 ++ | ||
| 20 | tests/test-subr.sh | 6 ------ | ||
| 21 | 3 files changed, 3 insertions(+), 7 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/configure.ac b/configure.ac | ||
| 24 | index 0670e01..14f3e36 100644 | ||
| 25 | --- a/configure.ac | ||
| 26 | +++ b/configure.ac | ||
| 27 | @@ -43,7 +43,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2025 The elfutils developers.]) | ||
| 28 | AC_PREREQ(2.69) dnl Minimum Autoconf version required. | ||
| 29 | |||
| 30 | dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. | ||
| 31 | -AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip parallel-tests]) | ||
| 32 | +AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip serial-tests]) | ||
| 33 | AM_MAINTAINER_MODE | ||
| 34 | |||
| 35 | AM_SILENT_RULES([yes]) | ||
| 36 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
| 37 | index 00ba754..6be7dd6 100644 | ||
| 38 | --- a/tests/Makefile.am | ||
| 39 | +++ b/tests/Makefile.am | ||
| 40 | @@ -937,3 +937,5 @@ check: check-am coverage | ||
| 41 | coverage: | ||
| 42 | -$(srcdir)/coverage.sh | ||
| 43 | endif | ||
| 44 | +oecheck: | ||
| 45 | + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) | ||
| 46 | diff --git a/tests/test-subr.sh b/tests/test-subr.sh | ||
| 47 | index ea80cbe..7632d20 100644 | ||
| 48 | --- a/tests/test-subr.sh | ||
| 49 | +++ b/tests/test-subr.sh | ||
| 50 | @@ -92,12 +92,6 @@ installed_testrun() | ||
| 51 | program="$1" | ||
| 52 | shift | ||
| 53 | case "$program" in | ||
| 54 | - ${abs_builddir}/*) | ||
| 55 | - if [ "x$elfutils_tests_rpath" != xno ]; then | ||
| 56 | - echo >&2 installcheck not possible with --enable-tests-rpath | ||
| 57 | - exit 77 | ||
| 58 | - fi | ||
| 59 | - ;; | ||
| 60 | ${abs_top_builddir}/src/*) | ||
| 61 | program=${bindir}/`program_transform ${program##*/}` | ||
| 62 | ;; | ||
diff --git a/meta/recipes-devtools/elfutils/files/run-ptest b/meta/recipes-devtools/elfutils/files/run-ptest deleted file mode 100644 index 3c6c14e47f..0000000000 --- a/meta/recipes-devtools/elfutils/files/run-ptest +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | #This script is used to run elfutils test suites | ||
| 4 | cd tests | ||
| 5 | |||
| 6 | make -k installcheck-local CC=gcc abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-, XFAIL_TESTS="@XFAIL_TESTS@" | ||
