* [Buildroot] [PATCH/next 1/1] package/docker-containerd: bump version to v0.2.8
From: Bernd Kuhls @ 2017-05-25 22:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index a161f3bd9..fc3735f78 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,2 +1,2 @@
# Computed locally
-sha256 8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826 docker-containerd-422e31ce907fd9c3833a38d7b8fdd023e5a76e73.tar.gz
+sha256 f002d4d93a86cd3a0c9e7d9d71455a94790302daab1e51dd2dd53e7f0ba4d217 docker-containerd-v0.2.8.tar.gz
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index c0b001285..f8e1f5fed 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
+DOCKER_CONTAINERD_VERSION = v0.2.8
DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 1/1] package/dmidecode: bump version to 3.1
From: Bernd Kuhls @ 2017-05-25 22:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/dmidecode/dmidecode.hash | 4 ++--
package/dmidecode/dmidecode.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash
index 307c306ad..1e8154b37 100644
--- a/package/dmidecode/dmidecode.hash
+++ b/package/dmidecode/dmidecode.hash
@@ -1,2 +1,2 @@
-# http://http.debian.net/debian/pool/main/d/dmidecode/dmidecode_3.0-2.dsc
-sha256 7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45 dmidecode-3.0.tar.xz
+# Locally computed
+sha256 d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0 dmidecode-3.1.tar.xz
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index b6c59db70..b6f96b6df 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DMIDECODE_VERSION = 3.0
+DMIDECODE_VERSION = 3.1
DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz
DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
DMIDECODE_LICENSE = GPL-2.0+
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 1/1] package/diffutils: bump version to 3.6
From: Bernd Kuhls @ 2017-05-25 22:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/diffutils/diffutils.hash | 2 +-
package/diffutils/diffutils.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash
index 7e99f1fc6..5506ab275 100644
--- a/package/diffutils/diffutils.hash
+++ b/package/diffutils/diffutils.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 diffutils-3.5.tar.xz
+sha256 d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6 diffutils-3.6.tar.xz
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index dee3faca1..4662e2bc3 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DIFFUTILS_VERSION = 3.5
+DIFFUTILS_VERSION = 3.6
DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 1/1] package/dialog: bump version to 1.3-20170509
From: Bernd Kuhls @ 2017-05-25 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/dialog/dialog.hash | 2 +-
package/dialog/dialog.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash
index 75a79189c..ac4278469 100644
--- a/package/dialog/dialog.hash
+++ b/package/dialog/dialog.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 1d98ec7cc81f11f9019fa0b90f1afdaa86579cae1ce8869a6fd61deb9d4b887a dialog-1.2-20150125.tgz
+sha256 2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756 dialog-1.3-20170509.tgz
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index f1c0e4c06..61ec2659a 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DIALOG_VERSION = 1.2-20150125
+DIALOG_VERSION = 1.3-20170509
DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
DIALOG_SITE = ftp://invisible-island.net/dialog
DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 1/1] package/dejavu: bump version to 2.37
From: Bernd Kuhls @ 2017-05-25 22:21 UTC (permalink / raw)
To: buildroot
Changed _SITE to https, fixed broken hash url.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/dejavu/dejavu.hash | 4 ++--
package/dejavu/dejavu.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/dejavu/dejavu.hash b/package/dejavu/dejavu.hash
index 37868c13d..db7365a1c 100644
--- a/package/dejavu/dejavu.hash
+++ b/package/dejavu/dejavu.hash
@@ -1,2 +1,2 @@
-# From http://dejavu-fonts.org/wiki/Download
-sha256 f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88 dejavu-fonts-ttf-2.35.tar.bz2
+# From https://dejavu-fonts.github.io/Download.html
+sha256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 dejavu-fonts-ttf-2.37.tar.bz2
diff --git a/package/dejavu/dejavu.mk b/package/dejavu/dejavu.mk
index 3dbcc94e1..9b57f0992 100644
--- a/package/dejavu/dejavu.mk
+++ b/package/dejavu/dejavu.mk
@@ -4,8 +4,8 @@
#
################################################################################
-DEJAVU_VERSION = 2.35
-DEJAVU_SITE = http://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION)
+DEJAVU_VERSION = 2.37
+DEJAVU_SITE = https://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION)
DEJAVU_SOURCE = dejavu-fonts-ttf-$(DEJAVU_VERSION).tar.bz2
DEJAVU_LICENSE_FILES = LICENSE
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 2/2] package/coreutils: bump version to 8.27
From: Bernd Kuhls @ 2017-05-25 21:56 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525215647.10315-1-bernd.kuhls@t-online.de>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/coreutils/coreutils.hash | 2 +-
package/coreutils/coreutils.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash
index 37d630bba..472cab55f 100644
--- a/package/coreutils/coreutils.hash
+++ b/package/coreutils/coreutils.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e coreutils-8.26.tar.xz
+sha256 8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b coreutils-8.27.tar.xz
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 0769bca0d..14b952f5a 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-COREUTILS_VERSION = 8.26
+COREUTILS_VERSION = 8.27
COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
COREUTILS_LICENSE = GPL-3.0+
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next 1/2] package/gettext: update wint_t.m4 from gnulib
From: Bernd Kuhls @ 2017-05-25 21:56 UTC (permalink / raw)
To: buildroot
Needed for coreutils bump to 8.27
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../gettext/0002-Update-after-gnulib-changed.patch | 86 ++++++++++++++++++++++
1 file changed, 86 insertions(+)
create mode 100644 package/gettext/0002-Update-after-gnulib-changed.patch
diff --git a/package/gettext/0002-Update-after-gnulib-changed.patch b/package/gettext/0002-Update-after-gnulib-changed.patch
new file mode 100644
index 000000000..5f5e5f6c2
--- /dev/null
+++ b/package/gettext/0002-Update-after-gnulib-changed.patch
@@ -0,0 +1,86 @@
+From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Tue, 16 May 2017 00:27:57 +0200
+Subject: [PATCH] Update after gnulib changed.
+
+For buildroot we only need to update wint_t.m4 to fix autoreconf with
+certain packages which already contain the updated version of this file.
+Otherwise autoreconf will break:
+
+http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html
+https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a
+
+Patch backported from upstream commit:
+http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f
+
+Needed for coreutils bump to 8.27
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
+index 8ff2a5b5a..d30b8bcf8 100644
+--- a/gettext-runtime/m4/wint_t.m4
++++ b/gettext-runtime/m4/wint_t.m4
+@@ -1,11 +1,12 @@
+-# wint_t.m4 serial 5 (gettext-0.18.2)
+-dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
++# wint_t.m4 serial 7
++dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+-dnl Test whether <wchar.h> has the 'wint_t' type.
++dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
++dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+
+ AC_DEFUN([gt_TYPE_WINT_T],
+@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T],
+ [gt_cv_c_wint_t=no])])
+ if test $gt_cv_c_wint_t = yes; then
+ AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
++
++ dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
++ dnl override 'wint_t'.
++ AC_CACHE_CHECK([whether wint_t is too small],
++ [gl_cv_type_wint_t_too_small],
++ [AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([[
++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
++ <wchar.h>.
++ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
++ included before <wchar.h>. */
++#if !(defined __GLIBC__ && !defined __UCLIBC__)
++# include <stddef.h>
++# include <stdio.h>
++# include <time.h>
++#endif
++#include <wchar.h>
++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
++ ]])],
++ [gl_cv_type_wint_t_too_small=no],
++ [gl_cv_type_wint_t_too_small=yes])])
++ if test $gl_cv_type_wint_t_too_small = yes; then
++ GNULIB_OVERRIDES_WINT_T=1
++ else
++ GNULIB_OVERRIDES_WINT_T=0
++ fi
++ else
++ GNULIB_OVERRIDES_WINT_T=0
++ fi
++ AC_SUBST([GNULIB_OVERRIDES_WINT_T])
++])
++
++dnl Prerequisites of the 'wint_t' override.
++AC_DEFUN([gl_TYPE_WINT_T_PREREQ],
++[
++ AC_CHECK_HEADERS_ONCE([crtdefs.h])
++ if test $ac_cv_header_crtdefs_h = yes; then
++ HAVE_CRTDEFS_H=1
++ else
++ HAVE_CRTDEFS_H=0
+ fi
++ AC_SUBST([HAVE_CRTDEFS_H])
+ ])
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH/next] package/kodi: bump version to 17.3
From: Bernd Kuhls @ 2017-05-25 21:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525084239.24966-1-bernd.kuhls@t-online.de>
Am Thu, 25 May 2017 10:42:39 +0200 schrieb Bernd Kuhls:
> Signed-off-by: Bernd Kuhls
> <bernd.kuhls@t-online.de>
> ---
> package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +-
> package/kodi-texturepacker/kodi-texturepacker.mk | 2 +-
> package/kodi/kodi.hash | 2 +-
> package/kodi/kodi.mk | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
Hi,
it just came to my attention that this version bump fixes a security
problem so I re-sent a new patch for the master branch:
http://patchwork.ozlabs.org/patch/767151/
Regards, Bernd
^ permalink raw reply
* [Buildroot] [PATCH 1/1] package/kodi: security bump to version 17.3
From: Bernd Kuhls @ 2017-05-25 21:26 UTC (permalink / raw)
To: buildroot
Release notes:
https://kodi.tv/article/kodi-v173-minor-bug-fix-and-security-release
"Fix possible security flaw which could abused .zip files which try to
traverse to a parent directory"
For details about the security bug refer to
http://blog.checkpoint.com/2017/05/23/hacked-in-translation/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +-
package/kodi-texturepacker/kodi-texturepacker.mk | 2 +-
package/kodi/kodi.hash | 2 +-
package/kodi/kodi.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
index 5f1a55dbb..217b39591 100644
--- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -6,7 +6,7 @@
# Not possible to directly refer to kodi variables, because of
# first/second expansion trickery...
-KODI_JSONSCHEMABUILDER_VERSION = 17.1-Krypton
+KODI_JSONSCHEMABUILDER_VERSION = 17.3-Krypton
KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0
diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk
index c6d3b0523..7c3e82a6c 100644
--- a/package/kodi-texturepacker/kodi-texturepacker.mk
+++ b/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -6,7 +6,7 @@
# Not possible to directly refer to kodi variables, because of
# first/second expansion trickery...
-KODI_TEXTUREPACKER_VERSION = 17.1-Krypton
+KODI_TEXTUREPACKER_VERSION = 17.3-Krypton
KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
KODI_TEXTUREPACKER_LICENSE = GPL-2.0
diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash
index 5e76fc50c..167b17928 100644
--- a/package/kodi/kodi.hash
+++ b/package/kodi/kodi.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee kodi-17.1-Krypton.tar.gz
+sha256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 kodi-17.3-Krypton.tar.gz
# Locally computed - libdvdcss
sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz
# Locally computed - libdvdnav
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 73e44f861..d5d4bf4c6 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -6,7 +6,7 @@
# When updating the version, please also update kodi-jsonschemabuilder
# and kodi-texturepacker
-KODI_VERSION = 17.1-Krypton
+KODI_VERSION = 17.3-Krypton
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
KODI_LICENSE = GPL-2.0
KODI_LICENSE_FILES = LICENSE.GPL
--
2.11.0
^ permalink raw reply related
* [Buildroot] [Bug 9896] host-gcc-initial error downloading because incorrect URL
From: bugzilla at busybox.net @ 2017-05-25 20:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-9896-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=9896
--- Comment #2 from Orion33 <orion_33@bk.ru> ---
Thanks for the advice, cap. I did the same, of course. The result is the same
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH 01/01] sngrep: bump version to v1.4.3
From: Thomas Petazzoni @ 2017-05-25 19:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525143412.3318-1-aduskett@codeblue.com>
Hello,
On Thu, 25 May 2017 10:34:12 -0400, Adam Duskett wrote:
> The two patches were committed upstream.
>
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
If both patches have been committed upstream, do we still need
SNGREP_AUTORECONF = YES ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [for-next 3/3] package/gcc: remove gcc 4.9
From: Romain Naour @ 2017-05-25 18:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525183457.12169-1-romain.naour@gmail.com>
We're already using 6.x as default, and have 5.x on the lower side
together with 7.x (7.1) on the higher side.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Dagg Stompler <daggs@gmx.com>
---
configs/odroidc2_defconfig is still using gcc 4.9 due to bugs in
uboot. But since then uboot version was changed.
Dagg can you test again with gcc 5 ?
---
Config.in.legacy | 7 +
...et-68059-libgcc-should-not-use-__write-fo.patch | 43 --
package/gcc/4.9.4/100-uclibc-conf.patch | 15 -
...00-powerpc-link-with-math-lib.patch.conditional | 122 ----
package/gcc/4.9.4/111-pr65730.patch | 34 --
...gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch | 26 -
package/gcc/4.9.4/130-pr43538.patch | 25 -
...tizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch | 37 --
package/gcc/4.9.4/301-missing-execinfo_h.patch | 13 -
package/gcc/4.9.4/810-arm-softfloat-libgcc.patch | 30 -
package/gcc/4.9.4/830-arm_unbreak_armv4t.patch | 13 -
.../840-microblaze-enable-dwarf-eh-support.patch | 166 ------
package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch | 274 ---------
package/gcc/4.9.4/860-cilk-wchar.patch | 56 --
.../870-xtensa-add-mauto-litpools-option.patch | 287 ---------
.../871-xtensa-reimplement-register-spilling.patch | 76 ---
...unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch | 33 --
.../gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch | 40 --
.../gcc/4.9.4/874-xtensa-add-uclinux-support.patch | 169 ------
.../gcc/4.9.4/880-nios2_legitimize_address.patch | 49 --
package/gcc/4.9.4/890-fix-m68k-compile.patch | 15 -
package/gcc/4.9.4/891-fix-m68k-uclinux.patch | 18 -
package/gcc/4.9.4/900-musl-support.patch | 640 ---------------------
package/gcc/4.9.4/901-microblaze-uclibc.patch | 21 -
.../930-libgcc-disable-split-stack-nothreads.patch | 14 -
package/gcc/4.9.4/940-uclinux-enable-threads.patch | 20 -
package/gcc/Config.in.host | 22 -
package/gcc/gcc.hash | 2 -
28 files changed, 7 insertions(+), 2260 deletions(-)
delete mode 100644 package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
delete mode 100644 package/gcc/4.9.4/100-uclibc-conf.patch
delete mode 100644 package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional
delete mode 100644 package/gcc/4.9.4/111-pr65730.patch
delete mode 100644 package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
delete mode 100644 package/gcc/4.9.4/130-pr43538.patch
delete mode 100644 package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
delete mode 100644 package/gcc/4.9.4/301-missing-execinfo_h.patch
delete mode 100644 package/gcc/4.9.4/810-arm-softfloat-libgcc.patch
delete mode 100644 package/gcc/4.9.4/830-arm_unbreak_armv4t.patch
delete mode 100644 package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
delete mode 100644 package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
delete mode 100644 package/gcc/4.9.4/860-cilk-wchar.patch
delete mode 100644 package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
delete mode 100644 package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
delete mode 100644 package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
delete mode 100644 package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
delete mode 100644 package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
delete mode 100644 package/gcc/4.9.4/880-nios2_legitimize_address.patch
delete mode 100644 package/gcc/4.9.4/890-fix-m68k-compile.patch
delete mode 100644 package/gcc/4.9.4/891-fix-m68k-uclinux.patch
delete mode 100644 package/gcc/4.9.4/900-musl-support.patch
delete mode 100644 package/gcc/4.9.4/901-microblaze-uclibc.patch
delete mode 100644 package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
delete mode 100644 package/gcc/4.9.4/940-uclinux-enable-threads.patch
diff --git a/Config.in.legacy b/Config.in.legacy
index a5f7288..391db6b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2017.08"
+config BR2_GCC_VERSION_4_9_X
+ bool "gcc 4.9.x support removed"
+ select BR2_LEGACY
+ help
+ Support for gcc version 4.9.x has been removed. The current
+ default version (6.x or later) has been selected instead.
+
config BR2_GCC_VERSION_4_8_X
bool "gcc 4.8.x support removed"
select BR2_LEGACY
diff --git a/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
deleted file mode 100644
index fd2bc69..0000000
--- a/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 80bc14a5249da7054b716229206b453f339b4a5e Mon Sep 17 00:00:00 2001
-From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 23 Nov 2015 15:17:55 +0000
-Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for
- printing fatal error
-
-libgcc/
- PR target/68059
- * config/arm/linux-atomic-64bit.c (__write): Rename to...
- (write): ...this and fix the return type.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 230762 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- libgcc/config/arm/linux-atomic-64bit.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c
-index 5b8c6e2..9078673 100644
---- a/libgcc/config/arm/linux-atomic-64bit.c
-+++ b/libgcc/config/arm/linux-atomic-64bit.c
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- kernels; we check for that in an init section and bail out rather
- unceremoneously. */
-
--extern unsigned int __write (int fd, const void *buf, unsigned int count);
-+extern int write (int fd, const void *buf, unsigned int count);
- extern void abort (void);
-
- /* Kernel helper for compare-and-exchange. */
-@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void)
- for the user - I'm not sure I can rely on much else being
- available at this point, so do the same as generic-morestack.c
- write () and abort (). */
-- __write (2 /* stderr. */, err, sizeof (err));
-+ write (2 /* stderr. */, err, sizeof (err));
- abort ();
- }
- };
---
-2.10.2
-
diff --git a/package/gcc/4.9.4/100-uclibc-conf.patch b/package/gcc/4.9.4/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a..0000000
--- a/package/gcc/4.9.4/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
diff --git a/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index 5e0484f..0000000
--- a/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in | 4 +++-
- libgcc/configure | 32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac | 21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: b/libgcc/Makefile.in
-===================================================================
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -42,6 +42,7 @@
- enable_vtable_verify = @enable_vtable_verify@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -943,9 +944,10 @@
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects) libgcc.a,$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
-Index: b/libgcc/configure
-===================================================================
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4535,6 +4536,37 @@
- fi
- fi
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: b/libgcc/configure.ac
-===================================================================
---- a/libgcc/configure.ac
-+++ b/libgcc/configure.ac
-@@ -357,6 +357,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/package/gcc/4.9.4/111-pr65730.patch b/package/gcc/4.9.4/111-pr65730.patch
deleted file mode 100644
index 8a41fd2..0000000
--- a/package/gcc/4.9.4/111-pr65730.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20 Max Filippov <jcmvbkbc@gmail.com>
-gcc/
- * config/xtensa/xtensa.c (init_alignment_context): Replace MULT
- by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1436,8 +1436,9 @@
- if (ac->shift != NULL_RTX)
- {
- /* Shift is the byte count, but we need the bitcount. */
-- ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
-- GEN_INT (BITS_PER_UNIT),
-+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+ GEN_INT (exact_log2 (BITS_PER_UNIT)),
- NULL_RTX, 1, OPTAB_DIRECT);
- ac->modemask = expand_simple_binop (SImode, ASHIFT,
- GEN_INT (GET_MODE_MASK (mode)),
diff --git a/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index bb77c4b..0000000
--- a/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -441,7 +441,7 @@
- extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- need_64bit_hwint=yes
- case x$with_cpu in
-- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- cpu_is_64bit=yes
- ;;
- esac
diff --git a/package/gcc/4.9.4/130-pr43538.patch b/package/gcc/4.9.4/130-pr43538.patch
deleted file mode 100644
index 19e57bb..0000000
--- a/package/gcc/4.9.4/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25 Marc Glisse <marc.glisse@inria.fr>
-
- PR target/43538
- * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
---
-2.1.4
-
diff --git a/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
deleted file mode 100644
index 55f3228..0000000
--- a/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3c536954a67a883630f4a7513a27f02a892c3dcb Mon Sep 17 00:00:00 2001
-From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
-Date: Tue, 21 Oct 2014 21:08:13 +0000
-Subject: [PATCH] [sanitizer] Fix build with _FILE_OFFSET_BITS=64.
-
-Sanitizer source is not affected by _FILE_OFFSET_BITS in general,
-but this one file must be built with 32-bit off_t. More details in the code.
-
-git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk at 220328 91177308-0d34-0410-b5e6-96231b3b80d8
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
-
- #include "sanitizer_platform.h"
- #if SANITIZER_LINUX || SANITIZER_MAC
-+// Tests in this file assume that off_t-dependent data structures match the
-+// libc ABI. For example, struct dirent here is what readdir() function (as
-+// exported from libc) returns, and not the user-facing "dirent", which
-+// depends on _FILE_OFFSET_BITS setting.
-+// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
-+#ifdef _FILE_OFFSET_BITS
-+#undef _FILE_OFFSET_BITS
-+#endif
-
- #include "sanitizer_internal_defs.h"
- #include "sanitizer_platform_limits_posix.h"
-
---
-2.1.4
-
diff --git a/package/gcc/4.9.4/301-missing-execinfo_h.patch b/package/gcc/4.9.4/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda2..0000000
--- a/package/gcc/4.9.4/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch b/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch b/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a..0000000
--- a/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch b/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
deleted file mode 100644
index 03fc47f..0000000
--- a/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
-
-From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Mon, 18 Jun 2012 20:18:13 +0200
-Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
-
-Changelog
-
-2013-03-18 Edgar E. Iglesias <edgar.iglesias@xilinx.com>
- David Holsgrove <david.holsgrove@xilinx.com>
-
- * common/config/microblaze/microblaze-common.c: Remove
- TARGET_EXCEPT_UNWIND_INFO definition.
- * config/microblaze/microblaze-protos.h: Add
- microblaze_eh_return prototype.
- * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
- microblaze_expand_epilogue, microblaze_return_addr): Handle
- calls_eh_return
- (microblaze_eh_return): New function.
- * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
- EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
- ASM_PREFERRED_EH_DATA_FORMAT
- * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
----
- gcc/common/config/microblaze/microblaze-common.c | 3 ---
- gcc/config/microblaze/microblaze-protos.h | 1 +
- gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md | 11 +++++++++
- 5 files changed, 52 insertions(+), 7 deletions(-)
-
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
---- a/gcc/common/config/microblaze/microblaze-common.c
-+++ b/gcc/common/config/microblaze/microblaze-common.c
-@@ -37,7 +37,4 @@
- #undef TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
-
--#undef TARGET_EXCEPT_UNWIND_INFO
--#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info
--
- struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
---- a/gcc/config/microblaze/microblaze-protos.h
-+++ b/gcc/config/microblaze/microblaze-protos.h
-@@ -54,6 +54,7 @@
- extern int symbol_mentioned_p (rtx);
- extern int label_mentioned_p (rtx);
- extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx);
-+extern void microblaze_eh_return (rtx op0);
- #endif /* RTX_CODE */
-
- /* Declare functions in microblaze-c.c. */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
---- a/gcc/config/microblaze/microblaze.c
-+++ b/gcc/config/microblaze/microblaze.c
-@@ -1906,6 +1906,11 @@
- if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
- return 1;
-
-+ if (crtl->calls_eh_return
-+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
-+ return 1;
-+ }
-+
- if (!crtl->is_leaf)
- {
- if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
-@@ -1933,6 +1938,13 @@
- return 1;
- }
-
-+ if (crtl->calls_eh_return
-+ && (regno == EH_RETURN_DATA_REGNO (0)
-+ || regno == EH_RETURN_DATA_REGNO (1)))
-+ {
-+ return 1;
-+ }
-+
- return 0;
- }
-
-@@ -2962,6 +2974,12 @@
- emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
- }
-
-+ if (crtl->calls_eh_return)
-+ emit_insn (gen_addsi3 (stack_pointer_rtx,
-+ stack_pointer_rtx,
-+ gen_rtx_raw_REG (SImode,
-+ MB_EH_STACKADJ_REGNUM)));
-+
- emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
- MB_ABI_SUB_RETURN_ADDR_REGNUM)));
- }
-@@ -3256,10 +3274,13 @@
- if (count != 0)
- return NULL_RTX;
-
-- return gen_rtx_PLUS (Pmode,
-- get_hard_reg_initial_val (Pmode,
-- MB_ABI_SUB_RETURN_ADDR_REGNUM),
-- GEN_INT (8));
-+ return get_hard_reg_initial_val (Pmode,
-+ MB_ABI_SUB_RETURN_ADDR_REGNUM);
-+}
-+
-+void microblaze_eh_return (rtx op0)
-+{
-+ emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
- }
-
- /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
---- a/gcc/config/microblaze/microblaze.h
-+++ b/gcc/config/microblaze/microblaze.h
-@@ -184,6 +184,21 @@
- #define INCOMING_RETURN_ADDR_RTX \
- gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
-
-+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */
-+#define RETURN_ADDR_OFFSET (8)
-+
-+/* Describe how we implement __builtin_eh_return. */
-+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
-+
-+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM
-+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
-+
-+/* Select a format to encode pointers in exception handling data. CODE
-+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is
-+ true if the symbol may be affected by dynamic relocations. */
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
-+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-+
- /* Use DWARF 2 debugging information by default. */
- #define DWARF2_DEBUGGING_INFO
- #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
---- a/gcc/config/microblaze/microblaze.md
-+++ b/gcc/config/microblaze/microblaze.md
-@@ -2261,4 +2261,15 @@
- (set_attr "mode" "SI")
- (set_attr "length" "4")])
-
-+; This is used in compiling the unwind routines.
-+(define_expand "eh_return"
-+ [(use (match_operand 0 "general_operand" ""))]
-+ ""
-+ "
-+{
-+ microblaze_eh_return(operands[0]);
-+ DONE;
-+}")
-+
- (include "sync.md")
-+
diff --git a/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch b/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 533d01f..0000000
--- a/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: update for 4.9.3]
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
- __builtin_va_list __args;
- __builtin_va_start(__args, __fmt);
-
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
- const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
- __builtin_va_list __args;
- __builtin_va_start(__args, __fmt);
-
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
- const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2843,7 +2843,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
-
- #include <ext/string_conversions.h>
-
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
- {
- const locale __loc = __io.getloc();
- const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- // First try a buffer perhaps big enough.
- int __cs_size = 64;
- char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- char __fbuf[16];
- __num_base::_S_format_float(__io, __fbuf, __mod);
-
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- // First try a buffer perhaps big enough (most probably sufficient
- // for non-ios_base::fixed outputs)
- int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -146,7 +146,7 @@
- using ::vsprintf;
- } // namespace
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
- using std::vwscanf;
- #endif
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -144,7 +144,7 @@
- using ::vsprintf;
- } // namespace std
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
-
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
-
- #include <ext/string_conversions.h>
-
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
-
- #include <cstdio>
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
-
- #if _GLIBCXX_HOSTED
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
- using std::vwscanf;
- #endif
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
-
- #if _GLIBCXX_HOSTED
-
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -788,7 +788,7 @@
- int __n __attribute__ ((__unused__)),
- const char* __fmt, _Tp __s) const throw ()
- {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- std::snprintf(__buf, __n, __fmt, __s);
- #else
- std::sprintf(__buf, __fmt, __s);
diff --git a/package/gcc/4.9.4/860-cilk-wchar.patch b/package/gcc/4.9.4/860-cilk-wchar.patch
deleted file mode 100644
index 1837405..0000000
--- a/package/gcc/4.9.4/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0)
- CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX)
diff --git a/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch b/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index 98c7b3f..0000000
--- a/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12 Max Filippov <jcmvbkbc@gmail.com>
-gcc/
- * config/xtensa/constraints.md (define_constraint "Y"): New
- constraint.
- * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
- * config/xtensa/linux.h (ASM_SPEC): Likewise.
- * config/xtensa/predicates.md (move_operand): Match constants
- and symbols in the presence of TARGET_AUTO_LITPOOLS.
- * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
- immediate references to TLS data.
- (xtensa_emit_move_sequence): Don't force constants to memory in
- the presence of TARGET_AUTO_LITPOOLS.
- (print_operand): Add 'y' format, same as default, but capable of
- printing SF mode constants as well.
- * config/xtensa/xtensa.md (movsi_internal, movhi_internal)
- (movsf_internal): Add movi pattern that loads literal.
- (movsf, movdf): Don't force constants to memory in the presence
- of TARGET_AUTO_LITPOOLS.
- (movdf_internal): Add 'Y' constraint.
- * config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md | 5 +++++
- gcc/config/xtensa/elf.h | 4 +++-
- gcc/config/xtensa/linux.h | 4 +++-
- gcc/config/xtensa/predicates.md | 3 ++-
- gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt | 4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
- (and (match_code "const_int")
- (match_test "xtensa_mask_immediate (ival)")))
-
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+ (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints. Do not use define_memory_constraint here. Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@
- %{mtarget-align:--target-align} \
- %{mno-target-align:--no-target-align} \
- %{mlongcalls:--longcalls} \
-- %{mno-longcalls:--no-longcalls}"
-+ %{mno-longcalls:--no-longcalls} \
-+ %{mauto-litpools:--auto-litpools} \
-+ %{mno-auto-litpools:--no-auto-litpools}"
-
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@
- %{mtarget-align:--target-align} \
- %{mno-target-align:--no-target-align} \
- %{mlongcalls:--longcalls} \
-- %{mno-longcalls:--no-longcalls}"
-+ %{mno-longcalls:--no-longcalls} \
-+ %{mauto-litpools:--auto-litpools} \
-+ %{mno-auto-litpools:--no-auto-litpools}"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- (match_test "GET_MODE_CLASS (mode) == MODE_INT
- && xtensa_simm12b (INTVAL (op))"))
- (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-- (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+ && CONSTANT_P (op)
- && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
-
- ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -477,6 +477,9 @@
- {
- int dst_regnum = xt_true_regnum (operands[0]);
-
-+ if (xtensa_tls_referenced_p (operands[1]))
-+ return FALSE;
-+
- /* The stack pointer can only be assigned with a MOVSP opcode. */
- if (dst_regnum == STACK_POINTER_REGNUM)
- return (mode == SImode
-@@ -1044,7 +1047,7 @@
- return 1;
- }
-
-- if (! TARGET_CONST16)
-+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- {
- src = force_const_mem (SImode, src);
- operands[1] = src;
-@@ -2428,6 +2431,20 @@
- }
- break;
-
-+ case 'y':
-+ if (GET_CODE (x) == CONST_DOUBLE &&
-+ GET_MODE (x) == SFmode)
-+ {
-+ REAL_VALUE_TYPE r;
-+ long l;
-+ REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+ REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+ fprintf (file, "0x%08lx", l);
-+ break;
-+ }
-+
-+ /* fall through */
-+
- default:
- if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -799,8 +799,8 @@
- })
-
- (define_insn "movsi_internal"
-- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
-- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
- "xtensa_valid_move (SImode, operands)"
- "@
- movi.n\t%0, %x1
-@@ -812,15 +812,16 @@
- mov\t%0, %1
- movsp\t%0, %1
- movi\t%0, %x1
-+ movi\t%0, %1
- const16\t%0, %t1\;const16\t%0, %b1
- %v1l32r\t%0, %1
- %v1l32i\t%0, %1
- %v0s32i\t%1, %0
- rsr\t%0, ACCLO
- wsr\t%1, ACCLO"
-- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
- (set_attr "mode" "SI")
-- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
-
- ;; 16-bit Integer moves
-
-@@ -834,21 +835,22 @@
- })
-
- (define_insn "movhi_internal"
-- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
-- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
- "xtensa_valid_move (HImode, operands)"
- "@
- movi.n\t%0, %x1
- mov.n\t%0, %1
- mov\t%0, %1
- movi\t%0, %x1
-+ movi\t%0, %1
- %v1l16ui\t%0, %1
- %v0s16i\t%1, %0
- rsr\t%0, ACCLO
- wsr\t%1, ACCLO"
-- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr")
-+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr")
- (set_attr "mode" "HI")
-- (set_attr "length" "2,2,3,3,3,3,3,3")])
-+ (set_attr "length" "2,2,3,3,3,3,3,3,3")])
-
- ;; 8-bit Integer moves
-
-@@ -919,7 +921,7 @@
- (match_operand:SF 1 "general_operand" ""))]
- ""
- {
-- if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
- operands[1] = force_const_mem (SFmode, operands[1]);
-
- if ((!register_operand (operands[0], SFmode)
-@@ -934,8 +936,8 @@
- })
-
- (define_insn "movsf_internal"
-- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
-- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
- "((register_operand (operands[0], SFmode)
- || register_operand (operands[1], SFmode))
- && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -950,13 +952,14 @@
- mov\t%0, %1
- wfr\t%0, %1
- rfr\t%0, %1
-+ movi\t%0, %y1
- const16\t%0, %t1\;const16\t%0, %b1
- %v1l32r\t%0, %1
- %v1l32i\t%0, %1
- %v0s32i\t%1, %0"
-- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
- (set_attr "mode" "SF")
-- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
-
- (define_insn "*lsiu"
- [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -997,7 +1000,7 @@
- (match_operand:DF 1 "general_operand" ""))]
- ""
- {
-- if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
- operands[1] = force_const_mem (DFmode, operands[1]);
-
- if (!register_operand (operands[0], DFmode)
-@@ -1008,8 +1011,8 @@
- })
-
- (define_insn_and_split "movdf_internal"
-- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
-- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
- "register_operand (operands[0], DFmode)
- || register_operand (operands[1], DFmode)"
- "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@
- Target
- Intersperse literal pools with code in the text section
-
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions
diff --git a/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch b/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08..0000000
--- a/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18 Max Filippov <jcmvbkbc@gmail.com>
-libgcc/
- * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
- CALL12 followed by series of ENTRY to spill windowed registers.
- (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
- instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- .global __xtensa_libgcc_window_spill
- .type __xtensa_libgcc_window_spill, at function
- __xtensa_libgcc_window_spill:
-- entry sp, 32
-- movi a2, 0
-- syscall
-+ entry sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+ call12 1f
-+ retw
-+ .align 4
-+1:
-+ .rept (XCHAL_NUM_AREGS - 24) / 12
-+ _entry sp, 48
-+ mov a12, a0
-+ .endr
-+ _entry sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+ mov a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+ mov a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+ mov a12, a12
-+#endif
-+ retw
-+#else
-+ mov a8, a8
- retw
-+#endif
- .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
-
-
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- entry sp, 32
-
- /* Flush registers. */
-- mov a5, a2
-- movi a2, 0
-- syscall
-- mov a2, a5
-+ call8 __xtensa_libgcc_window_spill
-
- /* Because the save area for a0-a3 is stored one frame below
- the one identified by a2, the only way to restore those
---
-1.8.1.4
-
diff --git a/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c0..0000000
--- a/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18 Max Filippov <jcmvbkbc@gmail.com>
-libgcc/
- * config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
- with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
-
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
-- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
---
-1.8.1.4
-
diff --git a/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch b/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc40513..0000000
--- a/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18 Max Filippov <jcmvbkbc@gmail.com>
-libgcc/
- * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
- context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
-- return (_Unwind_Ptr) context->cfa;
-+ return (_Unwind_Ptr) context->sp;
- }
-
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */
---
-1.8.1.4
-
diff --git a/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch b/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 881aec0..0000000
--- a/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03 Max Filippov <jcmvbkbc@gmail.com>
-gcc/
- * config.gcc (xtensa*-*-uclinux*): New configuration.
- * config/xtensa/uclinux.h: New file.
- * config/xtensa/uclinux.opt: New file.
-
-libgcc/
- * config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc | 5 ++++
- gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host | 5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2871,6 +2871,11 @@
- tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- tmake_file="${tmake_file} xtensa/t-xtensa"
- ;;
-+xtensa*-*-uclinux*)
-+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+ tmake_file="${tmake_file} xtensa/t-xtensa"
-+ extra_options="${extra_options} xtensa/uclinux.opt"
-+ ;;
- am33_2.0-*-linux*)
- tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+ Derived from the configuration for GCC for Intel i386 running Linux.
-+ Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3. If not see
-+<http://www.gnu.org/licenses/>. */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS() \
-+ do \
-+ { \
-+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \
-+ builtin_define ("__uClinux__"); \
-+ } \
-+ while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+ %{mno-text-section-literals:--no-text-section-literals} \
-+ %{mtarget-align:--target-align} \
-+ %{mno-target-align:--no-target-align} \
-+ %{mlongcalls:--longcalls} \
-+ %{mno-longcalls:--no-longcalls} \
-+ %{mauto-litpools:--auto-litpools} \
-+ %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+
-+/* Always enable "-fpic" for Xtensa Linux. */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC is free software; you can redistribute it and/or modify it under
-+; the terms of the GNU General Public License as published by the Free
-+; Software Foundation; either version 3, or (at your option) any later
-+; version.
-+;
-+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+; for more details.
-+;
-+; You should have received a copy of the GNU General Public License
-+; along with GCC; see the file COPYING3. If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1213,6 +1213,11 @@
- tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- md_unwind_header=xtensa/linux-unwind.h
- ;;
-+xtensa*-*-uclinux*)
-+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+ md_unwind_header=xtensa/linux-unwind.h
-+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+ ;;
- am33_2.0-*-linux*)
- # Don't need crtbeginT.o from *-*-linux* default.
- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
diff --git a/package/gcc/4.9.4/880-nios2_legitimize_address.patch b/package/gcc/4.9.4/880-nios2_legitimize_address.patch
deleted file mode 100644
index 4623f29..0000000
--- a/package/gcc/4.9.4/880-nios2_legitimize_address.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001
-From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 22 Sep 2015 12:23:20 +0000
-Subject: [PATCH] nios2_legitimize_address 2015-09-22 Chung-Lin Tang
- <cltang@codesourcery.com>
-
- Backport from mainline
- 2015-09-22 Chung-Lin Tang <cltang@codesourcery.com>
-
- * config/nios2/nios2.c (nios2_legitimize_address): When handling
- 'reg + reloc' cases, allow first operand to be non-REG, and use
- force_reg() to enforce address pattern.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch at 228013 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Fixes:
-http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0
-
-[backported to 4.9.3]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- gcc/config/nios2/nios2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
---- a/gcc/config/nios2/nios2.c
-+++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
-
- Which will be output as '%tls_le(var+48)(r23)' in assembly. */
- if (GET_CODE (x) == PLUS
-- && GET_CODE (XEXP (x, 0)) == REG
- && GET_CODE (XEXP (x, 1)) == CONST)
- {
-- rtx unspec, offset, reg = XEXP (x, 0);
-+ rtx unspec, offset;
- split_const (XEXP (x, 1), &unspec, &offset);
- if (GET_CODE (unspec) == UNSPEC
- && !nios2_large_offset_p (XINT (unspec, 1))
- && offset != const0_rtx)
- {
-+ rtx reg = force_reg (Pmode, XEXP (x, 0));
- unspec = copy_rtx (unspec);
- XVECEXP (unspec, 0, 0)
- = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
---
-2.5.0
-
diff --git a/package/gcc/4.9.4/890-fix-m68k-compile.patch b/package/gcc/4.9.4/890-fix-m68k-compile.patch
deleted file mode 100644
index 140977b..0000000
--- a/package/gcc/4.9.4/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c 2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c 2016-03-18 22:24:40.000000000 +0100
-@@ -33,7 +33,6 @@
- using the kernel helper defined below. There is no support for
- 64-bit operations yet. */
-
--#include <asm/unistd.h>
- #include <stdbool.h>
-
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/package/gcc/4.9.4/891-fix-m68k-uclinux.patch b/package/gcc/4.9.4/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4347642..0000000
--- a/package/gcc/4.9.4/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host 2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host 2016-04-05 16:20:53.422809885 +0200
-@@ -750,7 +750,7 @@
- m68k*-*-openbsd*)
- ;;
- m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc
-- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+ tmake_file="$tmake_file m68k/t-floatlib"
- md_unwind_header=m68k/linux-unwind.h
- ;;
- m68k-*-linux*) # Motorola m68k's running GNU/Linux
diff --git a/package/gcc/4.9.4/900-musl-support.patch b/package/gcc/4.9.4/900-musl-support.patch
deleted file mode 100644
index a862d01..0000000
--- a/package/gcc/4.9.4/900-musl-support.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-Add musl support to gcc
-
-This patch comes from the musl-cross project at
-https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
-
- * the config.sub modifications have been removed, because Buildroot
- already overwrites all config.sub with a more recent config.sub
- that has musl support.
-
- * change to ensure that a dummy dynamic linker path
- MUSL_DYNAMIC_LINKER<foo> is defined for all architectures,
- otherwise building gcc for architectures not supported by musl was
- causing build failure. Bug reported upstream at
- https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on.
-
- * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic
- and only add the musl one as an addition, not as a replacement. Not
- doing this breaks C++ exception handling with glibc, because
- USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script
- not testing dl_iterate_phdr() on any system except Solaris.
-
-[Gustavo: remove upstream applied gcc/config/sh/sh.c chunk for 4.9.1]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
- powerpc-*-eabi* | \
- powerpc-*-rtems* | \
- powerpcle-*-eabisim* | \
-- powerpcle-*-eabi* )
-+ powerpcle-*-eabi* | \
-+ *-musl* )
- # IF there is no include fixing,
- # THEN create a no-op fixer and exit
- (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -594,7 +594,7 @@
- esac
-
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
-
- # 32-bit x86 processors supported by --with-arch=. Each processor
- # MUST be separated by exactly one space.
-@@ -719,6 +719,9 @@
- *-*-*uclibc*)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
- ;;
-+ *-*-*musl*)
-+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+ ;;
- *)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
- ;;
-@@ -2338,6 +2341,10 @@
- powerpc*-*-linux*paired*)
- tm_file="${tm_file} rs6000/750cl.h" ;;
- esac
-+ case ${target} in
-+ *-linux*-musl*)
-+ enable_secureplt=yes ;;
-+ esac
- if test x${enable_secureplt} = xyes; then
- tm_file="rs6000/secureplt.h ${tm_file}"
- fi
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -22,6 +22,8 @@
- #define GCC_AARCH64_LINUX_H
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
-
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
- %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
- %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
-
-+/* For ARM musl currently supports four dynamic linkers:
-+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+ musl does not support the legacy OABI mode.
-+ All the dynamic linkers live in /lib.
-+ We default to soft-float, EL. */
-+#undef MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
- use the GNU/Linux version, not the generic BPABI version. */
- #undef LINK_SPEC
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,5 @@
-
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
-@@ -53,18 +55,21 @@
- uClibc or Bionic is the default C library and whether
- -muclibc or -mglibc or -mbionic has been passed to change the default. */
-
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
-- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
-+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
-
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -82,23 +87,103 @@
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
-
-+/* Musl dynamic linker paths must be defined on a per-architecture
-+ basis, for each architecture supported by Musl. However, in order
-+ to let other architectures continue to build with other C
-+ libraries, we provide a dummy definition of the following defines. */
-+#define MUSL_DYNAMIC_LINKER "invalid"
-+#define MUSL_DYNAMIC_LINKER32 "invalid"
-+#define MUSL_DYNAMIC_LINKER64 "invalid"
-+#define MUSL_DYNAMIC_LINKERX32 "invalid"
-+
- #define GNU_USER_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
-- BIONIC_DYNAMIC_LINKER)
-+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
-- BIONIC_DYNAMIC_LINKER32)
-+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
-- BIONIC_DYNAMIC_LINKER64)
-+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
-- BIONIC_DYNAMIC_LINKERX32)
-+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKER32)
-
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP \
-+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
-+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
-+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL \
-+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
-+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX \
-+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS \
-+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL \
-+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE \
-+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
-+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS \
-+ { \
-+ INCLUDE_DEFAULTS_MUSL_GPP \
-+ INCLUDE_DEFAULTS_MUSL_PREFIX \
-+ INCLUDE_DEFAULTS_MUSL_CROSS \
-+ INCLUDE_DEFAULTS_MUSL_TOOL \
-+ INCLUDE_DEFAULTS_MUSL_NATIVE \
-+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
-+ { 0, 0, 0, 0, 0, 0 } \
-+ }
-+#endif
-+
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target. We don't define below macros to normal linux
- versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -28,7 +28,23 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
-
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
- { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -371,17 +371,23 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
-
- #undef DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>. */
-
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
-
- /* Pass -G xxx to the compiler. */
- #define CC1_SPEC "%{G*} %(cc1_cpu)" \
-@@ -585,7 +588,8 @@
-
- /* Override the default target of the linker. */
- #define LINK_TARGET_SPEC \
-- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
-
- /* Any specific OS flags. */
- #define LINK_OS_SPEC "\
-@@ -763,15 +767,18 @@
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
-
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -894,6 +901,7 @@
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
- { "link_os_default", LINK_OS_DEFAULT_SPEC }, \
- { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
-+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
- { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
- { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
- { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
-Index: b/gcc/config/sh/linux.h
-===================================================================
---- a/gcc/config/sh/linux.h
-+++ b/gcc/config/sh/linux.h
-@@ -43,7 +43,15 @@
-
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
-
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -27601,6 +27601,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
-+ *-linux-musl*)
-+ gcc_cv_target_dl_iterate_phdr=yes
-+ ;;
- esac
-
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5173,6 +5173,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
-+ *-linux-musl*)
-+ gcc_cv_target_dl_iterate_phdr=yes
-+ ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__ /* BeOS */
- #define __SIZE_T__ /* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
- || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -73,6 +73,13 @@
- && defined(TARGET_DL_ITERATE_PHDR) \
- && defined(__sun__) && defined(__svr4__)
- # define USE_PT_GNU_EH_FRAME
-+ #endif
-+
-+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure
-+ script. */
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+ && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
- #endif
-
- #if defined(USE_PT_GNU_EH_FRAME)
-Index: b/libgomp/config/posix/time.c
-===================================================================
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
- The following implementation uses the most simple POSIX routines.
- If present, POSIX 4 clocks should be used instead. */
-
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@
-
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
-
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
- GLIBC has reserved words 10 through 13 for TM. */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
-
- #include "config/generic/tls.h"
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
-
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
-
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
-
- #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -266,6 +266,13 @@
- os_include_dir="os/bsd/freebsd"
- ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+ # check for musl by target
-+ case "${host_os}" in
-+ *-musl*)
-+ os_include_dir="os/generic"
-+ ;;
-+ *)
-+
- if [ "$uclibc" = "yes" ]; then
- os_include_dir="os/uclibc"
- elif [ "$bionic" = "yes" ]; then
-@@ -274,6 +281,9 @@
- os_include_dir="os/gnu-linux"
- fi
- ;;
-+
-+ esac
-+ ;;
- hpux*)
- os_include_dir="os/hpux"
- ;;
-Index: b/gcc/config/mips/linux64.h
-===================================================================
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -41,4 +41,4 @@
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
-- BIONIC_DYNAMIC_LINKERN32)
-+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -23,3 +23,11 @@
- #undef UCLIBC_DYNAMIC_LINKER
- #define UCLIBC_DYNAMIC_LINKER \
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
diff --git a/package/gcc/4.9.4/901-microblaze-uclibc.patch b/package/gcc/4.9.4/901-microblaze-uclibc.patch
deleted file mode 100644
index 82c44e1..0000000
--- a/package/gcc/4.9.4/901-microblaze-uclibc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Add dynamic linker support for uClibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
-
-diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h
---- gcc-4.9.3.orig/gcc/config/microblaze/linux.h 2016-06-04 21:21:09.430646655 +0200
-+++ gcc-4.9.3/gcc/config/microblaze/linux.h 2016-06-04 21:21:44.596003509 +0200
-@@ -36,10 +36,13 @@
-
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
- #if DEFAULT_LIBC == LIBC_MUSL
- #define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#elif DEFAULT_LIBC == LIBC_UCLIBC
-+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER
- #else
- #define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
diff --git a/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch b/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 670cf8d..0000000
--- a/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack 2016-03-07 01:34:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/package/gcc/4.9.4/940-uclinux-enable-threads.patch b/package/gcc/4.9.4/940-uclinux-enable-threads.patch
deleted file mode 100644
index 5108147..0000000
--- a/package/gcc/4.9.4/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -810,6 +810,9 @@
- *-*-uclinux*)
- extra_options="$extra_options gnu-user.opt"
- use_gcc_stdint=wrap
-+ case ${enable_threads} in
-+ "" | yes | posix) thread_file='posix' ;;
-+ esac
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
- ;;
- *-*-rdos*)
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 4c1d64c..7d6aab7 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -20,27 +20,6 @@ config BR2_GCC_VERSION_OR1K
depends on BR2_or1k
select BR2_TOOLCHAIN_GCC_AT_LEAST_5
-config BR2_GCC_VERSION_4_9_X
- bool "gcc 4.9.x"
- # Broken or unsupported architectures
- depends on !BR2_arc && !BR2_bfin && !BR2_or1k
- # Broken or unsupported ARM cores
- depends on !BR2_cortex_a17 && !BR2_cortex_a72
- # Unsupported MIPS cores
- depends on !BR2_mips_interaptiv
- # Unsupported for MIPS R5
- depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
- # Unsupported for MIPS R6
- depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
- # musl microblaze unsupported
- depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
- # musl ppc64 unsupported
- depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
- # musl mips64 unsupported
- depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
- # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
- select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
config BR2_GCC_VERSION_5_X
bool "gcc 5.x"
# Broken or unsupported architectures
@@ -89,7 +68,6 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
config BR2_GCC_VERSION
string
- default "4.9.4" if BR2_GCC_VERSION_4_9_X
default "5.4.0" if BR2_GCC_VERSION_5_X
default "6.3.0" if BR2_GCC_VERSION_6_X
default "7.1.0" if BR2_GCC_VERSION_7_X
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index 7a37bb6..c74679c 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -1,5 +1,3 @@
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum
-sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum
sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum
--
2.9.4
^ permalink raw reply related
* [Buildroot] [for-next 2/3] package/gcc: switch to gcc 6.x as the default
From: Romain Naour @ 2017-05-25 18:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525183457.12169-1-romain.naour@gmail.com>
Even if gcc 5 is still maintained for some time (gcc 5.5 is pending),
switch to gcc 6.x since it has been released since 2016-04-27 and
gcc 7.x is available since 2017-05-02.
We have been having toolchains in the autobuilders with gcc
6.x for a while, so the vast majority of the problems should have
already been solved.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/gcc/Config.in.host | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 61b0582..4c1d64c 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -4,7 +4,7 @@ choice
prompt "GCC compiler Version"
default BR2_GCC_VERSION_ARC if BR2_arc
default BR2_GCC_VERSION_OR1K if BR2_or1k
- default BR2_GCC_VERSION_5_X
+ default BR2_GCC_VERSION_6_X
help
Select the version of gcc you wish to use.
--
2.9.4
^ permalink raw reply related
* [Buildroot] [for-next 1/3] package/gcc: remove old hashes (gcc 4.5, 4.7, 4.8)
From: Romain Naour @ 2017-05-25 18:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/gcc/gcc.hash | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index 7255d12..7a37bb6 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -1,9 +1,3 @@
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/sha512.sum
-sha512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 gcc-4.5.4.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.7.4/sha512.sum
-sha512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189 gcc-4.7.4.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.8.5/sha512.sum
-sha512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea gcc-4.8.5.tar.bz2
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum
sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum
--
2.9.4
^ permalink raw reply related
* [Buildroot] [autobuild.buildroot.net] Build results for 2017-05-23
From: Matthew Weber @ 2017-05-25 18:29 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170524063115.3596E20835@mail.free-electrons.com>
Thomas,
On Wed, May 24, 2017 at 1:31 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> Build statistics for 2017-05-23
> ================================
>
> successes : 270
> failures : 10
> timeouts : 4
> TOTAL : 284
>
> Classification of failures by reason
> ====================================
>
> ffmpeg-3.3.1 | 3
> host-erlang-rebar-2.6.4 | 1
> libcec-4.0.2 | 1
> libsvgtiny-ea9d99fc8b231c22... | 1
> make[1]: *** wait: No child... | 1
> make[2]: *** [all] Terminated | 1
For these two and the host-erlang, I've restarted my server to see if
that helps. The failure timelines over the course of the last few
years are very hit and miss. Wondering if it's a uptime issue of the
environment......
> mpd-0.20.6 | 1
> mplayer-1.3.0 | 1
> php-7.1.5 | 1
> qt5base-5.8.0 | 1
> taskd-1.1.0 | 1
> xen-4.8.1 | 1
>
>
> Detail of failures
> ===================
>
> arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/94f725b25e27ca56a58a632c371fdf176cf15c79 |
> m68k | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/91c1dbc4648803ae4dab9053a4615fae6ad8b8be |
> arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/8926d319d6d1cd1ee72239ad7d9ca869d2355628 |
> aarch64 | host-erlang-rebar-2.6.4 | TIM | http://autobuild.buildroot.net/results/3f2c265fa35074bf893afb69ff3301334cf55745 |
> x86_64 | libcec-4.0.2 | NOK | http://autobuild.buildroot.net/results/7165e5dc3e5f3aa3d5f36b335ae2411d526acaf9 |
> sh4 | libsvgtiny-ea9d99fc8b231c22... | TIM | http://autobuild.buildroot.net/results/18e0ddfe06d6ccb62c7f50368a4b433bbf7f7fc3 |
> mipsel | make[1]: *** wait: No child... | TIM | http://autobuild.buildroot.net/results/22dcaadc1415eff2ae189a13ca65a40599de5481 |
> x86_64 | make[2]: *** [all] Terminated | TIM | http://autobuild.buildroot.net/results/32b929966e8843ec4947cea0941f14d977742467 |
> i686 | mpd-0.20.6 | NOK | http://autobuild.buildroot.net/results/ced22540ce3ea739f1dd8dc6701d8b87ddb3f295 |
> xtensa | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/3f40fbb5589530221850ede794f50184f11627d2 |
> arm | php-7.1.5 | NOK | http://autobuild.buildroot.net/results/a6ce47b57c882f3fe30f15983f79a6cb9024c43b | ORPH
> sparc | qt5base-5.8.0 | NOK | http://autobuild.buildroot.net/results/6f509497427846f9539da7a1e63a7e67c398b306 |
> x86_64 | taskd-1.1.0 | NOK | http://autobuild.buildroot.net/results/c2dd5c1c9dc87d2943c15e58ee56e67d7375368c |
> arm | xen-4.8.1 | NOK | http://autobuild.buildroot.net/results/552e66d764885341b2fe208a0e4382b5fe05ea9d |
>
> --
> http://autobuild.buildroot.net
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com
Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.
^ permalink raw reply
* [Buildroot] [PATCH v2 2/3] package/gcc: add support for gcc 7
From: Romain Naour @ 2017-05-25 17:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170524162612.09a18a25@free-electrons.com>
Hi Thomas,
Le 24/05/2017 ? 16:26, Thomas Petazzoni a ?crit :
> Hello,
>
> First of all, thanks for doing this work!
>
> I've added Alexey, Waldemar and Vicente in Cc, since there are some
> ARC, Microblaze, OpenRISC and MIPS questions below.
>
> On Tue, 23 May 2017 22:24:39 +0200, Romain Naour wrote:
>> Remove upstream patches:
>
> [...]
>
> Nice to see that so many patches are upstream, and that our stack of
> gcc patches for 7.x is now really small!
Indeed :)
>
> Perhaps we should start some effort to upstream the last few remaining
> patches?
I can add this in our TODO list for the next Buildroot summer camp or next meeting.
>
>> +config BR2_GCC_VERSION_7_X
>> + bool "gcc 7.x"
>> + # Broken or unsupported architectures
>> + depends on !BR2_arc
>> + depends on !BR2_microblaze
>> + depends on !BR2_or1k
>
> ARC is indeed still not supported fully in gcc 7.x I believe. Alexey,
> do you confirm?
>
> But what is the problem with Microblaze? And with OpenRISC? Waldemar?
>
> OpenRISC has its own gcc version, so I guess that's the answer. But
> what about Microblaze?
I haven't checked the status of all broken or unsupported architectures when
bumping to gcc 7. I wanted to keep the same dependency as gcc 6 for the moment.
>
>> + # Unsupported MIPS cores
>> + depends on !BR2_mips_m6250 && !BR2_mips_p6600
>
> Vicente, what is the status of the support for those MIPS cores in gcc
> 7.x ?
>
> Romain: I think we should also default to gcc 6.x now instead of
> defaulting to gcc 5.x.
>
> And perhaps we should start thinking about removing gcc 4.9.x as well.
> For toolchain components, I don't think it makes sense to support more
> than three versions, i.e:
>
> 1. old one (would be 5.x now)
> 2. default one (would be 6.x now)
> 3. bleeding edge one (would be 7.x now)
Ok :)
Best regards,
Romain
>
> Thanks!
>
> Thomas
>
^ permalink raw reply
* [Buildroot] [PATCH 2/2] linux: bump default version to 4.11.3
From: Bernd Kuhls @ 2017-05-25 17:44 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170525174412.1853-1-bernd.kuhls@t-online.de>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
linux/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 9c4d1c8463..305929de05 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -26,7 +26,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (4.11.2)"
+ bool "Latest version (4.11.3)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (v4.4.55-cip3)"
@@ -116,7 +116,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "4.11.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "4.11.3" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.55-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] linux-headers: bump 4.{4, 9, 11}.x series
From: Bernd Kuhls @ 2017-05-25 17:44 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 0c53416d94..5a0cd0382e 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -227,8 +227,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "3.10.105" if BR2_KERNEL_HEADERS_3_10
default "3.12.74" if BR2_KERNEL_HEADERS_3_12
default "4.1.39" if BR2_KERNEL_HEADERS_4_1
- default "4.4.69" if BR2_KERNEL_HEADERS_4_4
- default "4.9.29" if BR2_KERNEL_HEADERS_4_9
+ default "4.4.70" if BR2_KERNEL_HEADERS_4_4
+ default "4.9.30" if BR2_KERNEL_HEADERS_4_9
default "4.10.17" if BR2_KERNEL_HEADERS_4_10
- default "4.11.2" if BR2_KERNEL_HEADERS_4_11
+ default "4.11.3" if BR2_KERNEL_HEADERS_4_11
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
--
2.11.0
^ permalink raw reply related
* [Buildroot] [for-next] package/enlightenment: bump to 0.21.8
From: Romain Naour @ 2017-05-25 17:19 UTC (permalink / raw)
To: buildroot
See https://www.enlightenment.org/news/e0.21.8_release
"We are aware of a issue when running su/sudo under kernel 4.11 the fix
for this issue will be in an upcoming kernel release rather then here
see (https://phab.enlightenment.org/T5470)"
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/enlightenment/enlightenment.hash | 4 ++--
package/enlightenment/enlightenment.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash
index e69c7ff..0cb433f 100644
--- a/package/enlightenment/enlightenment.hash
+++ b/package/enlightenment/enlightenment.hash
@@ -1,2 +1,2 @@
-# From https://www.enlightenment.org/news/e-0.21.7-release
-sha256 7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 enlightenment-0.21.7.tar.xz
+# From https://www.enlightenment.org/news/e0.21.8_release
+sha256 fac21c5fb9cab89fb717b3577f7980fd0644ff1e94b144a55ba841116e8c5232 enlightenment-0.21.8.tar.xz
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 7bfc25b..b0c261a 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ENLIGHTENMENT_VERSION = 0.21.7
+ENLIGHTENMENT_VERSION = 0.21.8
ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
ENLIGHTENMENT_LICENSE = BSD-2-Clause
--
2.9.4
^ permalink raw reply related
* [Buildroot] [PATCH/next] package/tvheadend: bump version
From: Bernd Kuhls @ 2017-05-25 16:59 UTC (permalink / raw)
To: buildroot
Added optional pcre support implemented upstream by
https://github.com/tvheadend/tvheadend/commit/74a1c698c2c13bc9bfa6221aaf6b255e0e270e4c
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.hash | 2 +-
package/tvheadend/tvheadend.mk | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index cfd9c01bd..3154b3276 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz
+sha256 1994e379c798b118243e70f7fa38064a9b288d6e38b9ced0e8ad465f5d2e8fd9 tvheadend-54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 5ac44daf8..d66c0a6b3 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TVHEADEND_VERSION = 5cbaac172b4997fbf89667d79ac6e03b46460060
+TVHEADEND_VERSION = 54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -57,6 +57,13 @@ TVHEADEND_DEPENDENCIES += liburiparser
TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
endif
+ifeq ($(BR2_PACKAGE_PCRE),y)
+TVHEADEND_DEPENDENCIES += pcre
+TVHEADEND_CONF_OPTS += --enable-pcre
+else
+TVHEADEND_CONF_OPTS += --disable-pcre
+endif
+
TVHEADEND_DEPENDENCIES += dtv-scan-tables
# The tvheadend build system expects the transponder data to be present inside
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH v2] package/gnutls: disable for static build
From: Romain Naour @ 2017-05-25 16:34 UTC (permalink / raw)
To: buildroot
From: Bernd Kuhls <bernd.kuhls@t-online.de>
The gnutils code use __attribute__((constructor)) and
__attribute__((destructor)) to call constructor/desctructor when a
shared library is loaded.
Constructor/desctructor are not used when a static library is used
(except when if -Wl,--whole-archive -lgnutls -Wno-whole-archive is
used, not tested).
Even if gnutls initialization (_gnutls_global_init()) may be
called manually, the gnutls maintainer said it's not supported [1].
"Note that static linking applications with gnutls is not something
supported. gnutls relies on library constructors and destructors
which are not loaded when linking statically."
Now the gnutls script warn about static linking [2].
So disable gnutls statically by adding "depends on !BR2_STATIC_LIBS"
at Kconfig level and --disable-static in GNUTLS_CONF_OPTS.
Fixes:
[taskd] http://autobuild.buildroot.net/results/c2d/c2dd5c1c9dc87d2943c15e58ee56e67d7375368c
[ffmpeg] http://autobuild.buildroot.net/results/892/8926d319d6d1cd1ee72239ad7d9ca869d2355628
[sngrep] http://autobuild.buildroot.net/results/f7f/f7fb42d3742f6f01000a0d181e0c785640284405
[1] https://gitlab.com/gnutls/gnutls/issues/203
[2] https://gitlab.com/gnutls/gnutls/commit/6b748886799f88ddee9721dba4fc4d52854832ae
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Romain: merge our two patches together
add some option comment
disable static libgnutls.a
add sngrep autobuilder reference]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/aiccu/Config.in | 6 ++++--
package/connman/Config.in | 4 ++++
package/gnutls/Config.in | 6 ++++--
package/gnutls/gnutls.mk | 2 ++
package/libmicrohttpd/Config.in | 5 +++--
package/libsoup/Config.in | 4 ++++
package/network-manager/Config.in | 5 +++--
package/samba4/Config.in | 2 +-
package/taskd/Config.in | 6 ++++--
package/vpnc/Config.in | 5 +++--
package/webkitgtk/Config.in | 4 ++++
11 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index b346328..a2d6100 100644
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_AICCU
bool "aiccu"
+ depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
@@ -18,6 +19,7 @@ config BR2_PACKAGE_AICCU
http://www.sixxs.net/tools/aiccu/
-comment "aiccu needs a toolchain w/ wchar, threads"
+comment "aiccu needs a toolchain w/ wchar, threads, dynamic library"
depends on BR2_USE_MMU
- depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
+ || BR2_STATIC_LIBS
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 28cf168..253c604 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -33,12 +33,16 @@ config BR2_PACKAGE_CONNMAN_WIFI
config BR2_PACKAGE_CONNMAN_WISPR
bool "enable WISPr support"
+ depends on !BR2_STATIC_LIBS # gnutls
select BR2_PACKAGE_GNUTLS
help
Enable support for Wireless Internet Service Provider
roaming (WISPr). A RADIUS server is used to authenticate the
subscriber's credentials.
+comment "connman WISPr needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
+
config BR2_PACKAGE_CONNMAN_BLUETOOTH
bool "enable Bluetooth support"
help
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 1af00cd..1db069c 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,5 +1,7 @@
config BR2_PACKAGE_GNUTLS
bool "gnutls"
+ # https://gitlab.com/gnutls/gnutls/issues/203
+ depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_LIBUNISTRING
@@ -22,5 +24,5 @@ config BR2_PACKAGE_GNUTLS_TOOLS
endif
-comment "gnutls needs a toolchain w/ wchar"
- depends on !BR2_USE_WCHAR
+comment "gnutls needs a toolchain w/ wchar, dynamic library"
+ depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index c192469..9fd5a72 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -11,11 +11,13 @@ GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
+# Disable static library: https://gitlab.com/gnutls/gnutls/issues/203
GNUTLS_CONF_OPTS = \
--disable-doc \
--disable-guile \
--disable-libdane \
--disable-rpath \
+ --disable-static \
--enable-local-libopts \
--enable-openssl-compatibility \
--with-libnettle-prefix=$(STAGING_DIR)/usr \
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 302dbb7..2a685ca 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -12,14 +12,15 @@ if BR2_PACKAGE_LIBMICROHTTPD
config BR2_PACKAGE_LIBMICROHTTPD_SSL
bool "https support"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+ depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_WCHAR
select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT
help
Enable HTTPS (SSL) support.
-comment "libmicrohttpd https support needs a toolchain w/ wchar"
- depends on !BR2_USE_WCHAR
+comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library"
+ depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
endif
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index bc0ba95..236d3c4 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -22,11 +22,15 @@ config BR2_PACKAGE_LIBSOUP_GNOME
config BR2_PACKAGE_LIBSOUP_SSL
bool "https support"
+ depends on !BR2_STATIC_LIBS # gnutls
select BR2_PACKAGE_GLIB_NETWORKING
select BR2_PACKAGE_GNUTLS
help
Enable HTTPS (SSL) support.
+comment "libsoup https support needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
+
endif
comment "libsoup needs a toolchain w/ wchar, threads"
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index c9dabfd..04bb651 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETWORK_MANAGER
bool "networkmanager"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+ depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_MMU # dbus
depends on BR2_PACKAGE_HAS_UDEV
# Tested with 3.2, but may even work with earlier versions
@@ -57,8 +58,8 @@ comment "pppd support needs a glibc or uClibc toolchain"
endif
-comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7"
+comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 || \
- !BR2_TOOLCHAIN_USES_GLIBC
+ !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS
diff --git a/package/samba4/Config.in b/package/samba4/Config.in
index 4474185..ba48b8a 100644
--- a/package/samba4/Config.in
+++ b/package/samba4/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_SAMBA4
depends on BR2_USE_WCHAR # python
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
- depends on !BR2_STATIC_LIBS # python
+ depends on !BR2_STATIC_LIBS # python, gnutls
depends on !BR2_nios2 # binary too large, relocations don't fit
depends on BR2_TOOLCHAIN_HAS_SYNC_4
select BR2_PACKAGE_E2FSPROGS
diff --git a/package/taskd/Config.in b/package/taskd/Config.in
index 7d26aba..19d123f 100644
--- a/package/taskd/Config.in
+++ b/package/taskd/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_TASKD
bool "taskd"
+ depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_WCHAR # gnutls
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
@@ -11,6 +12,7 @@ config BR2_PACKAGE_TASKD
http://taskwarrior.org/
-comment "taskd needs a toolchain w/ C++, wchar"
+comment "taskd needs a toolchain w/ C++, wchar, dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+ BR2_STATIC_LIBS
diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in
index 2049c45..6455b0d 100644
--- a/package/vpnc/Config.in
+++ b/package/vpnc/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_VPNC
bool "vpnc"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+ depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # gnutls
select BR2_PACKAGE_LIBGCRYPT
@@ -15,6 +16,6 @@ config BR2_PACKAGE_VPNC
http://www.unix-ag.uni-kl.de/~massar/vpnc
-comment "vpnc needs a toolchain w/ wchar"
+comment "vpnc needs a toolchain w/ wchar, dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR
+ depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index 25f6fad..0e53d06 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -49,11 +49,15 @@ if BR2_PACKAGE_WEBKITGTK
config BR2_PACKAGE_WEBKITGTK_HTTPS
bool "HTTPS support"
+ depends on !BR2_STATIC_LIBS # gnutls -> libsoup
select BR2_PACKAGE_CA_CERTIFICATES # runtime
select BR2_PACKAGE_LIBSOUP_SSL
help
Enable HTTPS protocol support.
+comment "webkitgtk https support needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
+
config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
bool "multimedia support"
select BR2_PACKAGE_GSTREAMER1
--
2.9.4
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] package/sngrep: fix static build with gnutls
From: Romain Naour @ 2017-05-25 16:32 UTC (permalink / raw)
To: buildroot
In-Reply-To: <d6jivdxlhq.ln2@ID-313208.user.individual.net>
Hi Bernd,
Le 25/05/2017 ? 11:02, Bernd Kuhls a ?crit :
> Am Wed, 24 May 2017 23:54:03 +0200 schrieb Romain Naour:
>
>>> Yes, I believe we should add !BR2_STATIC_LIBS, of course propagated to
>>> all reverse dependencies (but there are not too many of them).
>>
>> Ok, I'll do it.
>
> Hi,
>
> patch done: http://patchwork.ozlabs.org/patch/766903/
Thanks for the help!
It was too late to finish my own patch yesterday...
Your patch is almost good but some option comments are missing.
Also, I suggest to add --disable-static in GNUTLS_CONF_OPTS unconditionally to
avoid linking with libgnutls.a even if libgnutls.so is present
(BR2_SHARED_STATIC_LIBS case).
I'll resend an updated version, I'm keeping you as original author.
Best regards,
Romain
>
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply
* [Buildroot] [PATCH/next] package/kodi-pvr-*: mass version bump
From: Bernd Kuhls @ 2017-05-25 16:25 UTC (permalink / raw)
To: buildroot
This commit brings our package versions in-line with upstream repo:
https://github.com/xbmc/repo-binary-addons/tree/Krypton
after this commit:
https://github.com/xbmc/repo-binary-addons/commit/a6621cbdc6ae2ef35b4188d909ca7f37a38a41f0
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +-
package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +-
package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +-
package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 2 +-
package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 2 +-
package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 2 +-
package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +-
package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +-
package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +-
package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +-
package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +-
package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +-
package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +-
package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +-
.../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash | 2 +-
package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk | 2 +-
package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +-
package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +-
package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +-
package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +-
package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +-
package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +-
package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +-
package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +-
package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +-
package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +-
package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +-
package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +-
package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +-
package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
index fa1785a4e..138efa1d0 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 d890af9db0b69c50d2e0f55d19ea9d678c335543c9f21287e98cb872c008d2bc kodi-pvr-argustv-9040b1447bd622bcbae3f8944e7b84d933037644.tar.gz
+sha256 ba9e4d76b9e6d2d879e95eeda0d919ca5eabc0d6f59037f173cd9294b2ce8e4a kodi-pvr-argustv-2.5.6-Krypton.tar.gz
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
index 5a610aa3a..2cf4d7529 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_ARGUSTV_VERSION = 9040b1447bd622bcbae3f8944e7b84d933037644
+KODI_PVR_ARGUSTV_VERSION = 2.5.6-Krypton
KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+
KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
index b4c5eb790..e9b867318 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 ac26d449915157a1d2833902c53dcb7fb341097bf984a7510c80f31a700bcba2 kodi-pvr-dvblink-17d12632b22efad4d3c4e73b8e48f58a6b13de01.tar.gz
+sha256 a45fff0c1fe6d91fd957e2a4e62e9c72a5c36d796c41caa6b1e5a4814f82a503 kodi-pvr-dvblink-3.4.5v2-Krypton.tar.gz
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
index 5f4b9e750..9860b63b2 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBLINK_VERSION = 17d12632b22efad4d3c4e73b8e48f58a6b13de01
+KODI_PVR_DVBLINK_VERSION = 3.4.5v2-Krypton
KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
KODI_PVR_DVBLINK_LICENSE = GPL-2.0+
KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
index 620606f4b..ccb45219c 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 6a6f0dc33d347d84233e22efa5da4033f9477fe6a9e8bb0a58d0b3f3152df384 kodi-pvr-dvbviewer-602042c9a7aa0035d799c6296e6ea06b5d5c3c4f.tar.gz
+sha256 4332fa50172409271909c90a8f923eb336ff93b0a7d61b183ce84d6975fa622e kodi-pvr-dvbviewer-2.4.11-Krypton.tar.gz
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
index d950b36a2..0c62c5a5b 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBVIEWER_VERSION = 602042c9a7aa0035d799c6296e6ea06b5d5c3c4f
+KODI_PVR_DVBVIEWER_VERSION = 2.4.11-Krypton
KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+
KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
index 74882d3d1..7417b2672 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 d59c4c5906411aff0c0160a8a478cdbee6559bd9a842b172cc24888da9abee25 kodi-pvr-filmon-ab9b5198feb7eb2ff94ea495414ff214c09c9391.tar.gz
+sha256 0384db9cbcd8ab2e7b8b0eb8c22e8913e734e436234c43d357718c5273058605 kodi-pvr-filmon-1.4.8-Krypton.tar.gz
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
index ff1d11594..daa3e39df 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_FILMON_VERSION = ab9b5198feb7eb2ff94ea495414ff214c09c9391
+KODI_PVR_FILMON_VERSION = 1.4.8-Krypton
KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
KODI_PVR_FILMON_LICENSE = GPL-2.0+
KODI_PVR_FILMON_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
index c2af4c76a..8262f4e11 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 8de6dff4853a6dab886e41dcd01bd017e9ee35fecdb0f6cfdec739bfe9214ad6 kodi-pvr-hdhomerun-60d89d16dd953d38947e8a6da2f8bb84a0f764ef.tar.gz
+sha256 3c000b3ebab2b12f5635451f6a71ad01c4f4d7043623cfeebfe6b7c662e026d9 kodi-pvr-hdhomerun-2.4.7-Krypton.tar.gz
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
index ab14f062c..75fa48764 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HDHOMERUN_VERSION = 60d89d16dd953d38947e8a6da2f8bb84a0f764ef
+KODI_PVR_HDHOMERUN_VERSION = 2.4.7-Krypton
KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION))
KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+
KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash
index 790667f9a..5656e8e3b 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.hash
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f3458e36811da1fcca88e0c0cd41b326845e1d45198d78b3c6e635b03f3bd40e kodi-pvr-hts-4e2a8334d4e62e63720a33a18c3e3c7ff4b4ad0b.tar.gz
+sha256 29867bd1fad4c4d69ec0d25ea1bb1507fd4543442aef890a2124f63f67318d92 kodi-pvr-hts-3.4.24-Krypton.tar.gz
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk
index a167295f2..fb5873bff 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.mk
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HTS_VERSION = 4e2a8334d4e62e63720a33a18c3e3c7ff4b4ad0b
+KODI_PVR_HTS_VERSION = 3.4.24-Krypton
KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
KODI_PVR_HTS_LICENSE = GPL-2.0+
KODI_PVR_HTS_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
index 12026d58d..906cbb575 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 789f6b83565de5607dc444ee7e1cf11b7568caea5373f9b994d68effcb98c62a kodi-pvr-iptvsimple-d7828163f26a0ccb175058faa9d87b1fcdc89220.tar.gz
+sha256 0a006e275cddba02d5d3fd22a95cec6411a765719509a9bc8fcc93dfa247bd4c kodi-pvr-iptvsimple-2.4.11-Krypton.tar.gz
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
index e6796e605..5ea0a454f 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_IPTVSIMPLE_VERSION = d7828163f26a0ccb175058faa9d87b1fcdc89220
+KODI_PVR_IPTVSIMPLE_VERSION = 2.4.11-Krypton
KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
index 5abc082a4..6eb0abfba 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 0b5b1ba387fa2f7c2374bc501bbb5a77aa95c016ac1b34a3b3933a89a21b0038 kodi-pvr-mediaportal-tvserver-d261c83a4ab40441be32c1202138fc6409a22974.tar.gz
+sha256 3f5c022f83636b3739f26c1a07166b498eac82e8081ed7551980f4bb27c6b56e kodi-pvr-mediaportal-tvserver-2.4.19v2-Krypton.tar.gz
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
index 6520e4ff9..99a318911 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = d261c83a4ab40441be32c1202138fc6409a22974
+KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.19v2-Krypton
KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+
KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
index 9c538882f..3d10b5bbe 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 039bf21f42032235056aeb9fc8800c41d5c4c842bbc1a0fb340a33cd04049587 kodi-pvr-nextpvr-dd03d62adab4f07c1354652033dffa6da25ba9b7.tar.gz
+sha256 b126943a6d48ea4d2df38951505f385c2a499e399201eccd798a34076d3c5842 kodi-pvr-nextpvr-2.4.13-Krypton.tar.gz
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
index 6776d1423..d0a04991d 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NEXTPVR_VERSION = dd03d62adab4f07c1354652033dffa6da25ba9b7
+KODI_PVR_NEXTPVR_VERSION = 2.4.13-Krypton
KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+
KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
index c201a73ad..261558ee3 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 6dc95a7fc0faeab30fb5e09ef3bc341f44bfa96500daaf3c169ae4e539745f71 kodi-pvr-njoy-ce66c1d40819cb42b3e70a3b616a7755099b2f3d.tar.gz
+sha256 e4e0a6bb1bf0c6f8ae011eba58c5f0ae19a6574bb35fc6a7fbdbb99d20242a2c kodi-pvr-njoy-2.4.3-Krypton.tar.gz
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
index 1c7c4dd7b..e946e6783 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NJOY_VERSION = ce66c1d40819cb42b3e70a3b616a7755099b2f3d
+KODI_PVR_NJOY_VERSION = 2.4.3-Krypton
KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
KODI_PVR_NJOY_LICENSE = GPL-2.0+
KODI_PVR_NJOY_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
index a1e650b7d..504480676 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 c348eb924d2a2842de919fd9561f2efd07586dfdef18cdb6b55a331e1ed3f11f kodi-pvr-pctv-85d6eae79876af8a6db2413e3884296520271768.tar.gz
+sha256 95f95f39739baf6013bb6c9188743f842f6ba3e1fa541907067f795e1a3c66a1 kodi-pvr-pctv-1.4.7-Krypton.tar.gz
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
index e3ff8b2d5..6c7a03049 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_PCTV_VERSION = 85d6eae79876af8a6db2413e3884296520271768
+KODI_PVR_PCTV_VERSION = 1.4.7-Krypton
KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
KODI_PVR_PCTV_LICENSE = GPL-2.0+
KODI_PVR_PCTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
index 4027d2bda..07c768f25 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 4156e9e1bf35621a5ef35ad4e944380ba3725789bc51694d397a831341ab517d kodi-pvr-stalker-df111a0d0a67669b732d8986e5473f3ffd9d7d9c.tar.gz
+sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139 kodi-pvr-stalker-2.8.6-Krypton.tar.gz
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
index 51dffb468..ee61171d7 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_STALKER_VERSION = df111a0d0a67669b732d8986e5473f3ffd9d7d9c
+KODI_PVR_STALKER_VERSION = 2.8.6-Krypton
KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
KODI_PVR_STALKER_LICENSE = GPL-2.0+
KODI_PVR_STALKER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
index 5472be8e4..5f2c78f0f 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f8e6cb967a175450bfc74225ae0b06b9a5e6fb91458f5123359191b4831c5921 kodi-pvr-vbox-adc6c346cc3570a232d336fcebfb0905eaaa9b96.tar.gz
+sha256 78065a46b95b3988b1e49fe05da249a1896f54a2c30116a9446f7c4f55db743b kodi-pvr-vbox-3.6.10-Krypton.tar.gz
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
index e786cbf37..2c54e1493 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VBOX_VERSION = adc6c346cc3570a232d336fcebfb0905eaaa9b96
+KODI_PVR_VBOX_VERSION = 3.6.10-Krypton
KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
KODI_PVR_VBOX_LICENSE = GPL-2.0+
KODI_PVR_VBOX_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
index 70c564e8e..7c91e3606 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 0c17505be16c581d4fad2912350b96f8efbf776657467f67becfd499950bd82d kodi-pvr-vuplus-25c4883e7c73c71d77fd32c8e33284ed5f081287.tar.gz
+sha256 79cd3ea79957ae2bca67c9a1cefe3546f27a6d4e88adb4973bb08228425be2fe kodi-pvr-vuplus-2.4.10-Krypton.tar.gz
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
index 1ea0d9482..e99f2260f 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VUPLUS_VERSION = 25c4883e7c73c71d77fd32c8e33284ed5f081287
+KODI_PVR_VUPLUS_VERSION = 2.4.10-Krypton
KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
KODI_PVR_VUPLUS_LICENSE = GPL-2.0+
KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
index 21fdd7128..4c050fb65 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 77eecab002e178ebdaa78c45ba43c836da002813e8c17769f6752dc91a8fef42 kodi-pvr-wmc-ed67cfedc1dad168c167d86d20fe4d0934504633.tar.gz
+sha256 7f5dfb88f54d511d575b7aabd94e1a862afb7e8a0b89fa957db6a135c31846eb kodi-pvr-wmc-1.4.9v2-Krypton.tar.gz
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
index c2969b805..b6e3d4325 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
@@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_WMC_VERSION = ed67cfedc1dad168c167d86d20fe4d0934504633
+KODI_PVR_WMC_VERSION = 1.4.9v2-Krypton
KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
KODI_PVR_WMC_LICENSE = GPL-2.0+
KODI_PVR_WMC_LICENSE_FILES = src/client.h
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH 01/01] sngrep: fix wchar detection.
From: Adam Duskett @ 2017-05-25 14:47 UTC (permalink / raw)
To: buildroot
Ncurses detection is currently broken in buildroot.
This patch does the following:
- Add SNGREP_CHECK_SCRIPT to configure.ac which checks for a
libname, a function in that library, sets a define if found, and
if not found, moves on to the next part. This is taken from the
htop configure.ac.
- Adds SNGREP_CHECK_LIB to configure.ac which checks for a
library, a function within that library, sets a define if that function
is found, and if not found, moves on to the next part.
This is taken from the htop configure.ac
- Modifies scrollbar.h and ui_panel.h to include <wctypes.h> instead of
<ncursesw/ncurses.h> if unicode is supported.
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
.../sngrep/0001-fix-ncurses-wchar-detection.patch | 119 +++++++++++++++++++++
package/sngrep/sngrep.mk | 5 +-
2 files changed, 123 insertions(+), 1 deletion(-)
create mode 100644 package/sngrep/0001-fix-ncurses-wchar-detection.patch
diff --git a/package/sngrep/0001-fix-ncurses-wchar-detection.patch b/package/sngrep/0001-fix-ncurses-wchar-detection.patch
new file mode 100644
index 0000000..b387ac5
--- /dev/null
+++ b/package/sngrep/0001-fix-ncurses-wchar-detection.patch
@@ -0,0 +1,119 @@
+From f812ceb065536697b238227b6a1fd432700f4ea9 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@codeblue.com>
+Date: Thu, 25 May 2017 10:13:12 -0400
+Subject: [PATCH] Fix ncurses wchar detection.
+
+Currently ncurses wchar detection relies on the ncurses header
+to be located at wncurses/ncurses.h. This currently doesn't work
+with buildroot. This patch fixes detection of the ncurses header
+and the ifdef's in the relevant header files.
+
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
+---
+ configure.ac | 47 ++++++++++++++++++++++++++++++++++++++++-------
+ src/curses/scrollbar.h | 5 ++---
+ src/curses/ui_panel.h | 5 ++---
+ 3 files changed, 44 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0255ad2..7a7f0ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,39 @@ AC_CHECK_HEADER([pcap.h], [], [
+ AC_MSG_ERROR([ You need to have libpcap development files installed to compile sngrep.])
+ ])
+
++# SNGREP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART)
++m4_define([SNGREP_CHECK_SCRIPT],
++[
++ if test ! -z "m4_toupper($SNGREP_[$1]_CONFIG_SCRIPT)"; then
++ # to be used to set the path to ncurses*-config when cross-compiling
++ sngrep_config_script=$(m4_toupper($SNGREP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
++ else
++ sngrep_config_script=$([$4] --libs 2> /dev/null)
++ fi
++ sngrep_script_success=no
++ sngrep_save_LDFLAGS="$LDFLAGS"
++ if test ! "x$sngrep_config_script" = x; then
++ LDFLAGS="$sngrep_config_script $LDFLAGS"
++ AC_CHECK_LIB([$1], [$2], [
++ AC_DEFINE([$3], 1, [The library is present.])
++ LIBS="$sngrep_config_script $LIBS "
++ sngrep_script_success=yes
++ ], [])
++ LDFLAGS="$save_LDFLAGS"
++ fi
++ if test "x$sngrep_script_success" = xno; then
++ [$5]
++ fi
++])
++
++# SNGREP_CHECK_LIB(LIBNAME, FUNCTION, DEFINE, ELSE_PART)
++m4_define([SNGREP_CHECK_LIB],
++[
++ AC_CHECK_LIB([$1], [$2], [
++ AC_DEFINE([$3], 1, [The library is present.])
++ LIBS="-l[$1] $LIBS "
++ ], [$4])
++])
+ ####
+ #### Ncurses Wide character support
+ ####
+@@ -53,13 +86,13 @@ AS_IF([test "x$enable_unicode" == "xyes"], [
+ # Ncurses with wide-character support
+ AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
+
+- AC_CHECK_HEADER([ncursesw/ncurses.h], [], [
+- AC_MSG_ERROR([ You need to have ncurses development files installed to compile sngrep.])
+- ])
+-
+- AC_CHECK_LIB([ncursesw], [initscr], [], [
+- AC_MSG_ERROR([ You need to have libncursesw installed to compile sngrep.])
+- ])
++ SNGREP_CHECK_SCRIPT([ncursesw6], [addnwstr], [WITH_UNICODE], "ncursesw6-config",
++ SNGREP_CHECK_SCRIPT([ncursesw], [addnwstr], [WITH_UNICODE], "ncursesw5-config",
++ SNGREP_CHECK_SCRIPT([ncurses], [addnwstr], [WITH_UNICODE], "ncurses5-config",
++ SNGREP_CHECK_LIB([ncursesw6], [addnwstr], [WITH_UNICODE],
++ SNGREP_CHECK_LIB([ncursesw], [addnwstr], [WITH_UNICODE],
++ SNGREP_CHECK_LIB([ncurses], [addnwstr], [WITH_UNICODE],
++ ))))))
+
+ AC_CHECK_LIB([panelw], [new_panel], [], [
+ AC_MSG_ERROR([ You need to have ncurses panelw library installed to compile sngrep.])
+diff --git a/src/curses/scrollbar.h b/src/curses/scrollbar.h
+index 960b936..c9fbfdc 100644
+--- a/src/curses/scrollbar.h
++++ b/src/curses/scrollbar.h
+@@ -32,10 +32,9 @@
+
+ #ifdef WITH_UNICODE
+ #define _X_OPEN_SOURCE_EXTENDED
+-#include <ncursesw/ncurses.h>
+-#else
+-#include <ncurses.h>
++#include <wctype.h>
+ #endif
++#include <ncurses.h>
+
+ //! Shorter declaration of scrollbar
+ typedef struct scrollbar scrollbar_t;
+diff --git a/src/curses/ui_panel.h b/src/curses/ui_panel.h
+index 9a4082a..549b593 100644
+--- a/src/curses/ui_panel.h
++++ b/src/curses/ui_panel.h
+@@ -33,10 +33,9 @@
+
+ #ifdef WITH_UNICODE
+ #define _X_OPEN_SOURCE_EXTENDED
+-#include <ncursesw/ncurses.h>
+-#else
+-#include <ncurses.h>
++#include <wctype.h>
+ #endif
++#include <ncurses.h>
+ #include <panel.h>
+ #include <form.h>
+ #include <stdbool.h>
+--
+2.9.4
+
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 560872f..9b62408 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -14,8 +14,11 @@ SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf
SNGREP_CONF_ENV += \
$(if $(BR2_STATIC_LIBS),LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`")
-# our ncurses wchar support is not properly detected
+ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
+SNGREP_CONF_OPTS += --enable-unicode
+else
SNGREP_CONF_OPTS += --disable-unicode
+endif
# openssl and gnutls can't be enabled at the same time.
ifeq ($(BR2_PACKAGE_OPENSSL),y)
--
2.9.4
^ permalink raw reply related
* [Buildroot] [PATCH 01/01] sngrep: bump version to v1.4.3
From: Adam Duskett @ 2017-05-25 14:34 UTC (permalink / raw)
To: buildroot
The two patches were committed upstream.
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
.../0001-src-Makefile.am-don-t-use-VPATH.patch | 43 -------------
...e.ac-switch-to-pkg-config-to-find-openssl.patch | 75 ----------------------
package/sngrep/sngrep.hash | 2 +-
package/sngrep/sngrep.mk | 2 +-
4 files changed, 2 insertions(+), 120 deletions(-)
delete mode 100644 package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
delete mode 100644 package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
diff --git a/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch b/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
deleted file mode 100644
index 3d98203..0000000
--- a/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 4 Mar 2017 15:02:43 +0100
-Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH
-
-VPATH is a mechanism used to allow out-of-tree build, not to use source
-code from a different directory. For this purpose, one should simply use
-the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of
-the sub-directory in the <prog>_SOURCES variable.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Upstream-status: https://github.com/irontec/sngrep/pull/176
----
- src/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 931ee06..961f4a0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
-+AUTOMAKE_OPTIONS=subdir-objects
- bin_PROGRAMS=sngrep
--VPATH=curses
- sngrep_SOURCES=capture.c
- if USE_EEP
- sngrep_SOURCES+=capture_eep.c
-@@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c
- endif
- sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
- sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
--sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c
--sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c
--sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c
--sngrep_SOURCES+=ui_column_select.c ui_settings.c
-+sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c
-+sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c
-+sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c
-+sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c
-
---
-2.7.4
-
diff --git a/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch b/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
deleted file mode 100644
index b51581f..0000000
--- a/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 22b08ab1a45eb3773b3c90dc37a31a7574520daa Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 4 Mar 2017 14:56:53 +0100
-Subject: [PATCH 2/2] configure.ac: switch to pkg-config to find openssl
-
-Using AC_CHECK_LIB() doesn't work properly for static linking, because
-it doesn't return information on transitive dependencies of
-libraries. For example, if library A internally uses library B, then
-with dynamic linking, doing -lA is sufficient. However, with static
-linking, one must do -lA -lB, and AC_CHECK_LIB() will only give the -lA
-information. This for example causes a build failure when building
-sngrep statically with openssl enabled:
-
-checking for SSL_new in -lssl... no
-configure: error: You need to have libssl installed to compile sngrep
-
-due to undefined symbols in the OpenSSL library.
-
-The proper solution for this is to discover the library using
-pkg-config, because pkg-config properly returns the list of necessary
-libraries, as it understands the concept of "list of libraries needed
-when dynamic linking" and "list of libraries needed for static linking".
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Upstream-status: https://github.com/irontec/sngrep/pull/176
----
- configure.ac | 9 +--------
- src/Makefile.am | 4 ++++
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 42e00e9..9f8e6d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,14 +129,7 @@ AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
- AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
- AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ])
- ], [])
--
-- AC_CHECK_LIB([ssl], [SSL_new], [], [
-- AC_MSG_ERROR([ You need to have libssl installed to compile sngrep])
-- ])
--
-- AC_CHECK_LIB([crypto], [EVP_get_cipherbyname], [], [
-- AC_MSG_ERROR([ You need to have libcrypto installed to compile sngrep])
-- ])
-+ PKG_CHECK_MODULES([SSL], [libssl libcrypto])
- AC_DEFINE([WITH_OPENSSL],[],[Compile With Openssl compatibility])
- ], [])
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 961f4a0..3a471b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,8 @@
- AUTOMAKE_OPTIONS=subdir-objects
- bin_PROGRAMS=sngrep
- sngrep_SOURCES=capture.c
-+sngrep_CFLAGS=
-+sngrep_LDADD=
- if USE_EEP
- sngrep_SOURCES+=capture_eep.c
- endif
-@@ -9,6 +11,8 @@ sngrep_SOURCES+=capture_gnutls.c
- endif
- if WITH_OPENSSL
- sngrep_SOURCES+=capture_openssl.c
-+sngrep_CFLAGS+=$(SSL_CFLAGS)
-+sngrep_LDADD+=$(SSL_LIBS)
- endif
- sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
- sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
---
-2.7.4
-
diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash
index dd75f89..bc28545 100644
--- a/package/sngrep/sngrep.hash
+++ b/package/sngrep/sngrep.hash
@@ -1 +1 @@
-sha256 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 sngrep-v1.4.2.tar.gz
+sha256 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 sngrep-v1.4.3.tar.gz
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 74b05b1..560872f 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SNGREP_VERSION = v1.4.2
+SNGREP_VERSION = v1.4.3
SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
SNGREP_LICENSE = GPL-3.0+
SNGREP_LICENSE_FILES = LICENSE
--
2.9.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox