summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2019-10-15 23:07:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2019-10-15 23:08:36 +0200
commitfb1227583603bc6fefbdac5c1b1bf81cdf737d65 (patch)
treea5bc6785527cf8bdc19e7ea5b27ceadae366edf5 /toolchain
parentfc597779adafc38a94c55798e42c11df610b7d4d (diff)
allow to build nds32 toolchain with old kernel
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/binutils/Makefile1
-rw-r--r--toolchain/binutils/patches/nds32-binutils-2.30-branch-open/fls-internal.patch29
2 files changed, 1 insertions, 29 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 67707c881..64c75e4b5 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -44,6 +44,7 @@ ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
--strip-components=1 -C $(WRKSRC) binutils
endif
(cd $(WRKBUILD); PATH='$(HOST_PATH)' \
+ LDFLAGS=-ldl \
MAKEINFO=true \
M4='${STAGING_HOST_DIR}/usr/bin/m4' \
$(WRKBUILD)/configure \
diff --git a/toolchain/binutils/patches/nds32-binutils-2.30-branch-open/fls-internal.patch b/toolchain/binutils/patches/nds32-binutils-2.30-branch-open/fls-internal.patch
deleted file mode 100644
index 33c78ac36..000000000
--- a/toolchain/binutils/patches/nds32-binutils-2.30-branch-open/fls-internal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur binutils-nds32-binutils-2.30-branch-open.orig/bfd/elf32-nds32.c binutils-nds32-binutils-2.30-branch-open/bfd/elf32-nds32.c
---- binutils-nds32-binutils-2.30-branch-open.orig/bfd/elf32-nds32.c 2018-05-10 22:01:57.000000000 +0200
-+++ binutils-nds32-binutils-2.30-branch-open/bfd/elf32-nds32.c 2018-05-12 09:01:10.000000000 +0200
-@@ -5286,7 +5286,7 @@
- }
-
- static unsigned int
--fls (register unsigned int x)
-+fls_internal (register unsigned int x)
- {
- return ffs (x & (-x));
- }
-@@ -6189,14 +6189,14 @@
-
- if (1 < ones32 (tls_type))
- {
-- eff_tls_type = 1 << (fls (tls_type) - 1);
-+ eff_tls_type = 1 << (fls_internal (tls_type) - 1);
- /* TLS model shall be handled in nds32_elf_unify_tls_model () */
-
- /* TLS model X -> LE is not implement yet!
- * workaround here! */
- if (eff_tls_type == GOT_TLS_LE)
- {
-- eff_tls_type = 1 << (fls (tls_type ^ eff_tls_type) - 1);
-+ eff_tls_type = 1 << (fls_internal (tls_type ^ eff_tls_type) - 1);
- }
- }
-