summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2019-02-18 08:55:23 (GMT)
committerAlexey Neyman <stilor@att.net>2019-02-18 08:55:23 (GMT)
commit8a61f74f38e33166f6be0dde0cae82cfe055c3bf (patch)
tree7f1313ccc9112cb0bc1a231a33c5344e54ec2c94 /packages
parent187aee1735421c983e792bcc96875f729391e906 (diff)
Pick up a newer revision of elf2flt
... which includes the two local patches we have. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/elf2flt/git-6d80ab6c/0000-Create-more-symlinks-to-BFD-headers.patch38
-rw-r--r--packages/elf2flt/git-6d80ab6c/0001-Check-output_elf-for-being-NULL.patch32
-rw-r--r--packages/elf2flt/package.desc2
3 files changed, 1 insertions, 71 deletions
diff --git a/packages/elf2flt/git-6d80ab6c/0000-Create-more-symlinks-to-BFD-headers.patch b/packages/elf2flt/git-6d80ab6c/0000-Create-more-symlinks-to-BFD-headers.patch
deleted file mode 100644
index 4b0fb90..0000000
--- a/packages/elf2flt/git-6d80ab6c/0000-Create-more-symlinks-to-BFD-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 902813b98dc5dd25719530d90a1d1502258eb458 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Sat, 29 Sep 2018 13:12:08 -0700
-Subject: [PATCH] Create more symlinks to BFD headers
-
-... diagnostics.h and bfd_stdint.h, included by <bfd/bfd.h>.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- Makefile.in | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index cfad06c..ed63bea 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,11 +123,16 @@ sinclude .deps
- $(CC) -MM $(CPPFLAGS) $(srcdir)/*.c > .deps
-
-
-+# Some versions of binutils may not have all these headers (diagnostics.h
-+# appeared in binutils 2.31; bfd_stdint.h in 2.32) so some symlinks may be
-+# dangling.
- bfd-headers/.stamp:
- rm -rf bfd-headers
- mkdir bfd-headers
-- ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h
-- for f in ansidecl filenames hashtab libiberty symcat; do \
-+ for f in bfd bfd_stdint; do \
-+ ln -sf $(BFD_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \
-+ done
-+ for f in ansidecl filenames hashtab libiberty symcat diagnostics; do \
- ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \
- done
- ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf
---
-2.19.1
-
diff --git a/packages/elf2flt/git-6d80ab6c/0001-Check-output_elf-for-being-NULL.patch b/packages/elf2flt/git-6d80ab6c/0001-Check-output_elf-for-being-NULL.patch
deleted file mode 100644
index 06c4044..0000000
--- a/packages/elf2flt/git-6d80ab6c/0001-Check-output_elf-for-being-NULL.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b6a77bbebb4573d1899cc72e964e9875aae64436 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Thu, 14 Feb 2019 20:12:34 -0800
-Subject: [PATCH] Check `output_elf' for being NULL
-
-... before passing it to unlink(). GCC8.2 detects that one of the
-branches in do_final_link() does not initialize it from its original
-value, NULL.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ld-elf2flt.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ld-elf2flt.c b/ld-elf2flt.c
-index de39fe0..ccb09b5 100644
---- a/ld-elf2flt.c
-+++ b/ld-elf2flt.c
-@@ -568,7 +568,9 @@ int main(int argc, char *argv[])
- if (!flag_verbose) {
- unlink(tmp_file);
- unlink(output_flt);
-- unlink(output_elf);
-+ if (output_elf) {
-+ unlink(output_elf);
-+ }
- } else {
- fprintf(stderr,
- "leaving elf2flt temp files behind:\n"
---
-2.19.1
-
diff --git a/packages/elf2flt/package.desc b/packages/elf2flt/package.desc
index c46788c..a6b8093 100644
--- a/packages/elf2flt/package.desc
+++ b/packages/elf2flt/package.desc
@@ -1,2 +1,2 @@
repository='git https://github.com/uclinux-dev/elf2flt.git'
-repository_cset='6d80ab6c93409e796f85da404bde84b841231531'
+repository_cset='7e33f28df198c46764021ed14408bd262751e148'