Merge pull request #904 from stilor/upgrade

A bunch of upgrades

config/comp_libs/gmp.in

@@ -2,4 +2,4 @@
 
 config GMP_HAS_MPBSD
     bool
-    default y if !GMP_5_1_or_later
+    default y if !GMP_5_1_0_or_later

config/comp_libs/mpc.in

@@ -1 +1,6 @@
 # MPC options
+# MPC 1.1.0 and later requires MPFR 3.0.0 or later and GMP 5.0.0 or later.
+# MPC 1.0.x and earlier break with MPFR 4.0.0.
+## select MPFR_REQUIRE_3_0_0_or_later if MPFR_NEEDED && MPC_1_1_0_or_later
+## select GMP_REQUIRE_5_0_0_or_later if GMP_NEEDED && MPC_1_1_0_or_later
+## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later

config/comp_libs/mpfr.in

@@ -1 +1 @@
-# GMP options
+# MPFR options

config/configure.in.in

@@ -44,3 +44,6 @@ config CONFIGURE_has_svn
 
 config CONFIGURE_has_git
     @KCONFIG_git@
+
+config CONFIGURE_has_install_with_strip_program
+    @KCONFIG_install_with_strip_program@

config/libc/glibc.in

@@ -26,9 +26,14 @@ config GLIBC_DEP_KERNEL_HEADERS_VERSION
 	def_bool y
 	select LINUX_REQUIRE_3_2_or_later if GLIBC_2_24_or_later
 
+# Glibc 2.26 requires at least binutils 2.25.
+# Also, binutils 2.30 fail while compiling aarch64 glibc; fixed in 2.27
+# and backported to 2.26. For other versions, require binutils older than
+# 2.30 (if the patch is backported, binutils 2.23 will break).
 config GLIBC_DEP_BINUTILS
     def_bool y
     select BINUTILS_REQUIRE_2_25_or_later if GLIBC_2_26_or_later
+    select BINUTILS_REQUIRE_older_than_2_30 if GLIBC_older_than_2_26 && ARCH_ARM && ARCH_64
 
 config GLIBC_DEP_GCC
     def_bool y

configure.ac

@@ -119,6 +119,22 @@ AC_DEFUN(
          [AC_MSG_ERROR([Required tool not found: $2])])
     ])
 
+# Check if install(1) supports --strip-program=...
+AC_DEFUN(
+    [ACX_INSTALL_STRIP_PROGRAM],
+    [touch conftest
+     mkdir conftest.dir
+     AC_MSG_CHECKING([if install takes --strip-program option])
+     AS_IF([$INSTALL --strip-program=true -s conftest conftest.dir/conftest 2>/dev/null],
+        [install_with_strip_program=y
+         AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+     ACX_SET_KCONFIG_OPTION([install_with_strip_program])
+     rm -rf conftest.dir
+     rm -f conftest
+    ])
+
+
 #--------------------------------------------------------------------
 # Allow dummy --{en,dis}able-{static,shared}
 AC_ARG_ENABLE(
@@ -159,6 +175,7 @@ AC_ARG_PROGRAM
 ACX_WITH_DEPRECATED([install], [INSTALL])
 AC_ARG_VAR([INSTALL], [Specify the full path to a BSD-compatible install])
 AC_PROG_INSTALL
+ACX_INSTALL_STRIP_PROGRAM
 
 ACX_WITH_DEPRECATED([grep], [GREP])
 AC_ARG_VAR([GREP], [Specify the full path to GNU grep])

maintainer/kconfig-versions.template

@@ -190,7 +190,9 @@ config @@fork|@@_VERY_NEW
     depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM
 #!foreach milestone
     select @@master|@@_@@ms|@@_or_later
+    select @@master|@@_later_than_@@ms|@@
     depends on !@@master|@@_REQUIRE_@@ms|@@_or_older
+    depends on !@@master|@@_REQUIRE_older_than_@@ms|@@
 #!end-foreach
 
 #!foreach version
@@ -203,17 +205,21 @@ config @@fork|@@_V_@@ver_sel|@@
     depends on EXPERIMENTAL
 #!end-if
 #!foreach milestone
+#!if [ "@@version_cmp_milestone@@" -gt 0 ]
+    depends on !@@master|@@_REQUIRE_@@ms|@@_or_older
+    select @@master|@@_later_than_@@ms|@@
+#!end-if
 #!if [ "@@version_cmp_milestone@@" -ge 0 ]
+    depends on !@@master|@@_REQUIRE_older_than_@@ms|@@
     select @@master|@@_@@ms|@@_or_later
 #!end-if
 #!if [ "@@version_cmp_milestone@@" -le 0 ]
+    depends on !@@master|@@_REQUIRE_later_than_@@ms|@@
     select @@master|@@_@@ms|@@_or_older
 #!end-if
-#!if [ "@@version_cmp_milestone@@" -gt 0 ]
-    depends on !@@master|@@_REQUIRE_@@ms|@@_or_older
-#!end-if
 #!if [ "@@version_cmp_milestone@@" -lt 0 ]
     depends on !@@master|@@_REQUIRE_@@ms|@@_or_later
+    select @@master|@@_older_than_@@ms|@@
 #!end-if
 #!end-foreach
 
@@ -223,7 +229,10 @@ config @@fork|@@_VERY_OLD
     depends on OBSOLETE && EXPERIMENTAL
     depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM
 #!foreach milestone
+    select @@master|@@_@@ms|@@_or_older
+    select @@master|@@_older_than_@@ms|@@
     depends on !@@master|@@_REQUIRE_@@ms|@@_or_later
+    depends on !@@master|@@_REQUIRE_later_than_@@ms|@@
 #!end-foreach
 
 endchoice
@@ -293,18 +302,30 @@ endif
 
 #!foreach milestone
 #!// Milestones selected by a chosen version of this package
+config @@master|@@_later_than_@@ms|@@
+    bool
+
 config @@master|@@_@@ms|@@_or_later
     bool
 
 config @@master|@@_@@ms|@@_or_older
     bool
 
+config @@master|@@_older_than_@@ms|@@
+    bool
+
 #!// Milestone requirements selected by other packages that restrict
 #!// the choices in this package
+config @@master|@@_REQUIRE_later_than_@@ms|@@
+    bool
+
 config @@master|@@_REQUIRE_@@ms|@@_or_later
     bool
 
 config @@master|@@_REQUIRE_@@ms|@@_or_older
     bool
 
+config @@master|@@_REQUIRE_older_than_@@ms|@@
+    bool
+
 #!end-foreach

packages/android-ndk/r16b/chksum

@@ -0,0 +1,4 @@
+md5 android-ndk-r16b-linux-x86_64.zip e21a2687c26b71379beecfd8d0525224
+sha1 android-ndk-r16b-linux-x86_64.zip 42aa43aae89a50d1c66c3f9fdecd676936da6128
+sha256 android-ndk-r16b-linux-x86_64.zip bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901
+sha512 android-ndk-r16b-linux-x86_64.zip 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7

packages/binutils/2.30/0000-sh-conf.patch

@@ -0,0 +1,34 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -3835,7 +3835,7 @@
+   nvptx*-*-*)
+     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -1166,7 +1166,7 @@
+   nvptx*-*-*)
+     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;

packages/binutils/2.30/0001-001_ld_makefile_patch.patch

@@ -0,0 +1,27 @@
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -446,7 +446,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include

packages/binutils/2.30/0002-012_check_ldrunpath_length.patch

@@ -0,0 +1,24 @@
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1470,6 +1470,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++	      	path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1750,6 +1752,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (*rpath == '\0'))
++  	rpath = NULL;
+
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)

packages/binutils/2.30/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch

@@ -0,0 +1,15 @@
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -101,7 +101,7 @@
+   int err = pthread_mutexattr_init(&attr);
+   if (err != 0)
+     gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err));
+-#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
++#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
+   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+   if (err != 0)
+     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));

packages/binutils/2.30/0004-Dont-link-to-libfl-as-its-unnecessary.patch

@@ -0,0 +1,105 @@
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -12150,6 +12150,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12311,6 +12312,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ # If we haven't got the data from the intl directory,
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -87,7 +87,10 @@
+ fi
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ ZW_GNU_GETTEXT_SISTER_DIR
+--- a/gas/configure
++++ b/gas/configure
+@@ -13003,6 +13003,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -13164,6 +13165,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
+ # If we haven't got the data from the intl directory,
+--- a/gas/configure.ac
++++ b/gas/configure.ac
+@@ -795,7 +795,10 @@
+ AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
+ ZW_GNU_GETTEXT_SISTER_DIR
+--- a/ld/configure
++++ b/ld/configure
+@@ -16222,6 +16222,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -16383,6 +16384,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -234,7 +234,10 @@
+ AC_EXEEXT
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ AM_MAINTAINER_MODE
+ AM_CONDITIONAL(GENINSRC_NEVER, false)

packages/binutils/2.30/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch

@@ -0,0 +1,15 @@
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/binary.cc
++++ b/gold/binary.cc
+@@ -23,7 +23,7 @@
+ #include "gold.h"
+
+ #include <cerrno>
+-#include <cstring>
++#include <string>
+
+ #include "elfcpp.h"
+ #include "stringpool.h"