Procházet zdrojové kódy

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb před 9 roky
rodič
revize
06192043a9
77 změnil soubory, kde provedl 390 přidání a 4659 odebrání
  1. 2 3
      package/base-files/Makefile
  2. 4 6
      package/busybox/config/console-tools/Config.in
  3. 30 22
      package/firefox/Makefile
  4. 1 1
      package/firefox/files/firefox
  5. 37 26
      package/firefox/patches/patch-configure
  6. 10 0
      package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
  7. 0 10
      package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp
  8. 0 13
      package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
  9. 0 10
      package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
  10. 0 48
      package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc
  11. 7 7
      package/firefox/patches/patch-js_src_Makefile_in
  12. 0 12
      package/firefox/patches/patch-js_src_assembler_wtf_Platform_h
  13. 0 31
      package/firefox/patches/patch-js_src_configure
  14. 0 11
      package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h
  15. 0 43
      package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
  16. 0 12
      package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h
  17. 0 23
      package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py
  18. 0 26
      package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py
  19. 0 11
      package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_audio_device_impl_cc
  20. 0 11
      package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_device_alsa_linux_cc
  21. 0 11
      package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_mixer_manager_alsa_linux_cc
  22. 0 23
      package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
  23. 0 3385
      package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
  24. 0 15
      package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_bsd_addr_c
  25. 0 22
      package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_os_userspace_h
  26. 0 25
      package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_pcb_c
  27. 0 14
      package/firefox/patches/patch-netwerk_sctp_src_user_environment_c
  28. 0 12
      package/firefox/patches/patch-netwerk_sctp_src_user_queue_h
  29. 5 5
      package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py
  30. 6 6
      package/firefox/patches/patch-tools_profiler_platform-linux_cc
  31. 0 11
      package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc
  32. 11 11
      package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
  33. 18 13
      package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
  34. 0 17
      package/firefox/patches/patch-xpcom_threads_nsThread_cpp
  35. 6 6
      package/fontsproto/Makefile
  36. 1 1
      package/libXtst/Makefile
  37. 3 2
      package/libstdcxx/Makefile
  38. 5 5
      package/nss/Makefile
  39. 3 3
      package/nss/patches/patch-nss_coreconf_Linux_mk
  40. 3 3
      package/nss/patches/patch-nss_coreconf_command_mk
  41. 6 3
      package/nss/patches/patch-nss_manifest_mn
  42. 2 2
      package/openssl/Makefile
  43. 1 3
      package/php/Makefile
  44. 6 480
      package/php/files/php.ini
  45. 10 2
      package/php/files/php.init
  46. 3 3
      package/python2/Makefile
  47. 4 4
      package/sqlite/Makefile
  48. 7 8
      package/xf86-input-keyboard/Makefile
  49. 9 10
      package/xf86-input-mouse/Makefile
  50. 9 9
      package/xf86-video-intel/Makefile
  51. 6 7
      package/xorg-server/Makefile
  52. 0 13
      package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
  53. 0 13
      package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
  54. 8 8
      package/xproto/Makefile
  55. 1 0
      rules.mk
  56. 8 0
      target/Makefile
  57. 1 0
      target/aarch64/systems/arm-fm
  58. 1 0
      target/arm/systems/linksys-nslu2
  59. 1 0
      target/arm/systems/raspberry-pi
  60. 1 0
      target/arm/systems/sharp-zaurus
  61. 1 0
      target/arm/systems/solidrun-imx6
  62. 2 1
      target/avr32/systems/atmel-ngw100
  63. 1 0
      target/config/Config.in
  64. 13 22
      target/config/Config.in.adk
  65. 2 10
      target/config/Config.in.binfmt
  66. 34 31
      target/config/Config.in.hardware
  67. 14 12
      target/config/Config.in.qemuopts
  68. 68 63
      target/config/Config.in.runtime
  69. 2 30
      target/config/Config.in.target
  70. 0 1
      target/config/Config.in.toolchain
  71. 4 4
      target/config/Config.in.x86.choice
  72. 4 4
      target/config/Config.in.x86.default
  73. 1 0
      target/mips/systems/dragino-ms14s
  74. 1 0
      target/mips/systems/mikrotik-rb4xx
  75. 1 0
      target/mips/systems/mikrotik-rb532
  76. 1 0
      target/x86_64/systems/pcengines-apu
  77. 5 0
      toolchain/elf2flt/Makefile

+ 2 - 3
package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.1
-PKG_RELEASE:=		10
+PKG_RELEASE:=		11
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -96,8 +96,7 @@ endif
 	    echo "ff02::2 ip6-allrouters" >> $(IDIR_BASE_FILES)/etc/hosts
 	    echo "ff02::3 ip6-allhosts" >> $(IDIR_BASE_FILES)/etc/hosts
 	test -z '$(ADK_RUNTIME_PASSWORD)' || \
-	    $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \
-	    $$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \
+	    $(SED) 's,\*NP\*,'"$$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \
 		 $(IDIR_BASE_FILES)/etc/shadow
 	echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs
 ifeq ($(ADK_TARGET_WITH_ROOT_RW),y)

+ 4 - 6
package/busybox/config/console-tools/Config.in

@@ -46,7 +46,6 @@ config BUSYBOX_DUMPKMAP
 config BUSYBOX_KBD_MODE
 	bool "kbd_mode"
 	default n
-	default y if ADK_TARGET_WITH_INPUT
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program reports and sets keyboard mode.
@@ -60,7 +59,6 @@ config BUSYBOX_LOADFONT
 
 config BUSYBOX_LOADKMAP
 	bool "loadkmap"
-	default y if ADK_TARGET_WITH_INPUT
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -84,7 +82,7 @@ config BUSYBOX_RESET
 
 config BUSYBOX_RESIZE
 	bool "resize"
-	default y
+	default n
 	help
 	  This program is used to (re)set the width and height of your current
 	  terminal.
@@ -138,7 +136,7 @@ config BUSYBOX_DEFAULT_SETFONT_DIR
 
 config BUSYBOX_SETKEYCODES
 	bool "setkeycodes"
-	default y
+	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads entries into the kernel's scancode-to-keycode
@@ -146,14 +144,14 @@ config BUSYBOX_SETKEYCODES
 
 config BUSYBOX_SETLOGCONS
 	bool "setlogcons"
-	default y
+	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program redirects the output console of kernel messages.
 
 config BUSYBOX_SHOWKEY
 	bool "showkey"
-	default y
+	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Shows keys pressed.

+ 30 - 22
package/firefox/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		26.0
-PKG_RELEASE:=		4
-PKG_HASH:=		31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812
+PKG_VERSION:=		35.0
+PKG_RELEASE:=		1
+PKG_HASH:=		bedeb5bbd8b49e5b286497ef7732542c6e7441088fd8cd577d7ca8af4c871e81
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
@@ -18,20 +18,21 @@ PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolo
 PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
 PKG_BUILDDEP+=		zip-host
 PKG_URL:=		http://www.mozilla.org/
-PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
+PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/
 PKG_NOPARALLEL:=	1
 
 PKG_ARCH_DEPENDS:=	arm x86 x86_64 mips
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
-PKG_SYSTEM_DEPENDS:=	tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
+PKG_SYSTEM_DEPENDS:=	solidrun-imx6 ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
-WRKDIST=		${WRKDIR}/mozilla-release
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).source.tar.bz2
+WRKDIST=		$(WRKDIR)/mozilla-release
+WRKBUILD=		$(WRKDIR)/$(PKG_NAME)-obj
 
 include $(ADK_TOPDIR)/mk/package.mk
 include $(ADK_TOPDIR)/mk/python.mk
 
-$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 ifeq ($(ADK_DEBUG),y)
 CONFIGURE_ARGS+=	--enable-debug --enable-logging
@@ -42,14 +43,14 @@ endif
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			PYTHON="$(PYTHON)" \
-			HOST_CC="${HOST_CC}" \
-			HOST_CPPFLAGS="${HOST_CPPFLAGS}" \
-			HOST_CFLAGS="${HOST_CFLAGS}" \
-			HOST_LDFLAGS="${HOST_LDLAGS}" \
-			HOST_CXX="${HOST_CXX}" \
-			HOST_CXXFLAGS="${HOST_CXXFLAGS}" \
+			HOST_CC="$(HOST_CC)" \
+			HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
+			HOST_CFLAGS="$(HOST_CFLAGS)" \
+			HOST_LDFLAGS="$(HOST_LDLAGS)" \
+			HOST_CXX="$(HOST_CXX)" \
+			HOST_CXXFLAGS="$(HOST_CXXFLAGS)" \
 			HOST_RANLIB="ranlib" HOST_AR="ar" \
-			CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \
+			CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include/freetype2" \
 			ac_cv_sqlite_secure_delete=yes \
 			ac_cv_sqlite_threadsafe=yes \
 			ac_cv_sqlite_enable_fts3=yes \
@@ -66,19 +67,24 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-nspr \
 			--with-system-pango \
 			--with-system-libvpx \
-			--with-system-libevent=${STAGING_TARGET_DIR}/usr \
+			--with-system-libevent=$(STAGING_TARGET_DIR)/usr \
 			--enable-system-ffi \
 			--enable-system-sqlite \
 			--disable-libnotify \
-			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
-			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
+			--with-libIDL-prefix=$(STAGING_TARGET_DIR)/usr \
+			--with-glib-prefix=$(STAGING_TARGET_DIR)/usr \
 			--enable-chrome-format=jar \
 			--enable-necko-protocols=all \
 			--enable-libxul \
 			--enable-alsa \
+			--disable-profiling \
+			--disable-jprof \
+			--disable-shark \
+			--disable-systrace \
 			--disable-pulseaudio \
 			--disable-gstreamer \
 			--disable-gio \
+			--disable-gold \
 			--disable-gconf \
 			--disable-accessibility \
 			--disable-smil \
@@ -98,6 +104,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-mathml \
 			--disable-jemalloc \
 			--disable-crashreporter \
+			--disable-printing \
+			--disable-pie \
 			--disable-updater \
 			--disable-xpcom-fastload \
 			--disable-url-classifier \
@@ -109,17 +117,17 @@ TARGET_CFLAGS:=		$(subst Os,g3,$(TARGET_CFLAGS))
 endif
 
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
-XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
+XAKE_FLAGS+=            ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
 pre-build:
-	-mkdir ${WRKBUILD}/js/src/.deps
+	-mkdir $(WRKBUILD)/js/src/.deps
 
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \
+	$(CP) $(WRKINST)/usr/lib/firefox-$(PKG_VERSION) \
 		$(IDIR_FIREFOX)/usr/lib
 	$(CP) ./files/firefox \
 		$(IDIR_FIREFOX)/usr/bin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 1 - 1
package/firefox/files/firefox

@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-26.0 /usr/lib/firefox-26.0/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-35.0 /usr/lib/firefox-35.0/firefox

+ 37 - 26
package/firefox/patches/patch-configure

@@ -1,30 +1,41 @@
---- mozilla-release.orig/configure	2013-12-05 17:08:46.000000000 +0100
-+++ mozilla-release/configure	2014-01-06 18:17:43.008094174 +0100
-@@ -9787,27 +9787,6 @@ if test -z "$GNU_CC"; then
-     esac
+--- mozilla-release.orig/configure	2015-01-09 05:39:04.000000000 +0100
++++ mozilla-release/configure	2015-02-04 11:49:00.000000000 +0100
+@@ -8156,38 +8156,6 @@ EOF
+ 
  fi
  
--if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then
--            if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then
--        GOLD=$($CC -print-prog-name=ld.gold)
--        case "$GOLD" in
--        /*)
--            ;;
--        *)
--            GOLD=$(which $GOLD)
--            ;;
--        esac
--        if test -n "$GOLD"; then
--            mkdir -p $_objdir/build/unix/gold
--            ln -s "$GOLD" $_objdir/build/unix/gold/ld
--            if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then
--                LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold"
--            else
--                rm -rf $_objdir/build/unix/gold
--            fi
--        fi
--    fi
+-MOZ_ENABLE_PROFILER_SPS=1
+-
+-case "${OS_TARGET}" in
+-Android)
+-    case "${CPU_ARCH}" in
+-    x86 | arm) ;;
+-    *)
+-        MOZ_ENABLE_PROFILER_SPS=
+-    esac
+-    ;;
+-Linux)
+-    case "${CPU_ARCH}" in
+-    x86 | x86_64) ;;
+-    *)
+-        MOZ_ENABLE_PROFILER_SPS=
+-    esac
+-    ;;
+-WINNT|Darwin) ;;
+-*)
+-    MOZ_ENABLE_PROFILER_SPS=
+-    ;;
+-esac
+-
+-if test -n "$MOZ_ENABLE_PROFILER_SPS"; then
+-    cat >> confdefs.pytmp <<\EOF
+-    (''' MOZ_ENABLE_PROFILER_SPS ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define MOZ_ENABLE_PROFILER_SPS 1
+-EOF
+-
 -fi
  
- if test "$GNU_CC"; then
-     if test -z "$DEVELOPER_OPTIONS"; then
+ # Check whether --enable-shark or --disable-shark was given.
+ if test "${enable_shark+set}" = set; then

+ 10 - 0
package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp

@@ -0,0 +1,10 @@
+--- mozilla-release.orig/gfx/angle/src/common/angleutils.cpp	2015-01-09 05:38:28.000000000 +0100
++++ mozilla-release/gfx/angle/src/common/angleutils.cpp	2015-02-03 04:42:10.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include "common/angleutils.h"
+ 
+ #include <vector>
++#include <cstdio>
+ 
+ std::string FormatString(const char *fmt, va_list vararg)
+ {

+ 0 - 10
package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp

@@ -1,10 +0,0 @@
---- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp	2013-12-05 17:07:31.000000000 +0100
-+++ mozilla-release/gfx/layers/BufferUnrotate.cpp	2014-01-06 21:27:39.000000000 +0100
-@@ -8,6 +8,7 @@
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
-                     int aByteStride, int aXBoundary, int aYBoundary)

+ 0 - 13
package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc

@@ -1,13 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -5,7 +5,9 @@
- #include "build/build_config.h"
- #include "base/debug_util.h"
- 
--#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))
-+#include <features.h>
-+
-+#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID) && !defined(__UCLIBC__)) && defined(__GLIBC__)
- 
- #include <errno.h>
- #include <fcntl.h>

+ 0 - 10
package/firefox/patches/patch-ipc_chromium_src_base_file_util_h

@@ -1,10 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-12-05 17:07:35.000000000 +0100
-+++ mozilla-release/ipc/chromium/src/base/file_util.h	2014-01-02 15:01:42.000000000 +0100
-@@ -16,7 +16,6 @@
- #include <sys/stat.h>
- #elif defined(OS_POSIX) 
- #include <sys/types.h>
--#include <fts.h>
- #include <sys/stat.h>
- #endif
- 

+ 0 - 48
package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc

@@ -1,48 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-12-05 17:07:35.000000000 +0100
-+++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2014-01-02 14:53:44.000000000 +0100
-@@ -8,13 +8,16 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fnmatch.h>
--#ifndef ANDROID
-+#ifndef __GLIBC__
-+#define NO_FTS
-+#endif
-+#ifndef NO_FTS
- #include <fts.h>
- #endif
- #include <libgen.h>
- #include <stdio.h>
- #include <string.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/mman.h>
- #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
- #include <sys/stat.h>
-@@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r
-   if (!recursive)
-     return (rmdir(path_str) == 0);
- 
--#ifdef ANDROID
-+#ifdef NO_FTS
-   // XXX Need ftsless impl for bionic
-   return false;
- #else
-@@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_
-     return false;
-   }
- 
--#ifdef ANDROID
-+#ifdef NO_FTS
-   // XXX Need ftsless impl for bionic
-   return false;
- #else
-@@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa
-     return false;
-   tmpdir = tmpdir.Append(kTempFileName);
-   std::string tmpdir_string = tmpdir.value();
--#ifdef ANDROID
-+#ifdef NO_FTS
-   char* dtemp = NULL;
- #else
-   // this should be OK since mkdtemp just replaces characters in place

+ 7 - 7
package/firefox/patches/patch-js_src_Makefile_in

@@ -1,11 +1,11 @@
---- mozilla-release.orig/js/src/Makefile.in	2013-12-05 17:07:35.000000000 +0100
-+++ mozilla-release/js/src/Makefile.in	2014-01-02 14:53:44.000000000 +0100
-@@ -103,7 +103,7 @@ ifdef JS_HAS_CTYPES
- VPATH += $(srcdir)/ctypes
+--- mozilla-release.orig/js/src/Makefile.in	2015-01-09 05:38:17.000000000 +0100
++++ mozilla-release/js/src/Makefile.in	2015-01-29 17:03:28.000000000 +0100
+@@ -21,7 +21,7 @@ NO_EXPAND_LIBS = 1
  
+ ifdef JS_HAS_CTYPES
  ifdef MOZ_NATIVE_FFI
 -LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
-+LOCAL_INCLUDES =
- else
- LOCAL_INCLUDES = -Ictypes/libffi/include
++LOCAL_INCLUDES = 
  endif
+ 
+ # Windows needs this to be linked with a static library.

+ 0 - 12
package/firefox/patches/patch-js_src_assembler_wtf_Platform_h

@@ -1,12 +0,0 @@
---- mozilla-release.orig/js/src/assembler/wtf/Platform.h	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/js/src/assembler/wtf/Platform.h	2013-10-28 12:43:50.000000000 +0100
-@@ -139,8 +139,7 @@
- 
- /* WTF_CPU_MIPS - MIPS 32-bit */
- /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now.  */
--#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
--    && defined(_ABIO32)
-+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
- #define WTF_CPU_MIPS 1
- #if defined(__MIPSEB__)
- #define WTF_CPU_BIG_ENDIAN 1

+ 0 - 31
package/firefox/patches/patch-js_src_configure

@@ -1,31 +0,0 @@
---- mozilla-release.orig/js/src/configure	2013-12-05 17:08:46.000000000 +0100
-+++ mozilla-release/js/src/configure	2014-01-07 19:30:38.660353287 +0100
-@@ -8652,28 +8652,6 @@ if test -z "$GNU_CC"; then
-     esac
- fi
- 
--if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then
--            if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then
--        GOLD=$($CC -print-prog-name=ld.gold)
--        case "$GOLD" in
--        /*)
--            ;;
--        *)
--            GOLD=$(which $GOLD)
--            ;;
--        esac
--        if test -n "$GOLD"; then
--            mkdir -p $_objdir/build/unix/gold
--            ln -s "$GOLD" $_objdir/build/unix/gold/ld
--            if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then
--                LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold"
--            else
--                rm -rf $_objdir/build/unix/gold
--            fi
--        fi
--    fi
--fi
--
- if test "$GNU_CC"; then
-     if test -z "$DEVELOPER_OPTIONS"; then
-         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"

+ 0 - 11
package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h

@@ -1,11 +0,0 @@
---- mozilla-release.orig/js/src/yarr/BumpPointerAllocator.h	2013-09-11 01:15:09.000000000 +0200
-+++ mozilla-release/js/src/yarr/BumpPointerAllocator.h	2013-10-28 12:44:10.000000000 +0100
-@@ -38,6 +38,8 @@ namespace WTF {
- #define MINIMUM_BUMP_POOL_SIZE 0x2000
- #elif WTF_CPU_IA64
- #define MINIMUM_BUMP_POOL_SIZE 0x4000
-+#elif WTF_CPU_MIPS
-+#define MINIMUM_BUMP_POOL_SIZE 0x4000
- #else
- #define MINIMUM_BUMP_POOL_SIZE 0x1000
- #endif

+ 0 - 43
package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c

@@ -1,43 +0,0 @@
---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-03-16 18:41:03.000000000 +0100
-@@ -45,7 +45,9 @@ static char *RCSSTRING __UNUSED__="$Id:
- #include <sys/param.h>
- #include <sys/socket.h>
- #ifndef ANDROID
-+#ifdef __GLIBC__
- #include <sys/sysctl.h>
-+#endif
- #include <sys/syslog.h>
- #else
- #include <syslog.h>
-@@ -53,7 +55,9 @@ static char *RCSSTRING __UNUSED__="$Id:
- #undef __unused
- #include <linux/sysctl.h>
- #endif
-+#if defined(__GLIBC__)
- #include <net/if.h>
-+#endif
- #ifndef LINUX
- #if !defined(__OpenBSD__) && !defined(__NetBSD__)
- #include <net/if_var.h>
-@@ -61,14 +65,17 @@ static char *RCSSTRING __UNUSED__="$Id:
- #include <net/if_dl.h>
- #include <net/if_types.h>
- #include <sys/sockio.h>
--#else
-+#elif defined(__GLIBC__)
- #include <linux/sockios.h>
- #include <linux/if.h>
- #include <linux/kernel.h>
- #include <linux/wireless.h>
--#ifndef ANDROID
- #include <linux/ethtool.h>
--#endif
-+#else
-+#include <linux/sockios.h>
-+#include <linux/kernel.h>
-+#include <linux/wireless.h>
-+#include <linux/ethtool.h>
- #endif
- #include <net/route.h>
- 

+ 0 - 12
package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h

@@ -1,12 +0,0 @@
---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/stun.h	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h	2014-01-03 17:19:05.000000000 +0100
-@@ -39,7 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- #else
- #include <sys/param.h>
- #include <sys/socket.h>
-+#if defined(__GLIBC__)
- #include <net/if.h>
-+#endif
- #ifndef LINUX
- #if !defined(__OpenBSD__) && !defined(__NetBSD__)
- #include <net/if_var.h>

+ 0 - 23
package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py

@@ -1,23 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2014-02-05 08:12:49.000000000 +0100
-@@ -364,20 +364,6 @@ def WriteOnDiff(filename):
- 
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
--  flavors = {
--    'cygwin': 'win',
--    'win32': 'win',
--    'darwin': 'mac',
--  }
--
--  if 'flavor' in params:
--    return params['flavor']
--  if sys.platform in flavors:
--    return flavors[sys.platform]
--  if sys.platform.startswith('sunos'):
--    return 'solaris'
--  if sys.platform.startswith('freebsd'):
--    return 'freebsd'
- 
-   return 'linux'
- 

+ 0 - 26
package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py

@@ -1,26 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2014-02-05 08:13:30.000000000 +0100
-@@ -118,23 +118,6 @@ def ensure_directory_exists(path):
- 
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
--  system = platform.system().lower()
--  flavors = {
--    'microsoft': 'win',
--    'windows'  : 'win',
--    'cygwin'   : 'win',
--    'darwin'   : 'mac',
--    'sunos'    : 'solaris',
--    'dragonfly': 'dragonfly',
--    'freebsd'  : 'freebsd',
--    'netbsd'   : 'netbsd',
--    'openbsd'  : 'openbsd',
--  }
--
--  if 'flavor' in params:
--    return params['flavor']
--  if system in flavors:
--    return flavors[system]
- 
-   return 'linux'
- 

+ 0 - 11
package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_audio_device_impl_cc

@@ -1,11 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc	2013-09-11 01:15:17.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -8,6 +8,8 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
-+#define _POSIX_SOURCE
-+
- #include "audio_device_impl.h"
- #include "audio_device_config.h"
- #include "common_audio/signal_processing/include/signal_processing_library.h"

+ 0 - 11
package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_device_alsa_linux_cc

@@ -1,11 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc	2013-09-11 01:15:17.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -8,6 +8,8 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
-+#define _POSIX_SOURCE
-+
- #include <cassert>
- 
- #include "audio_device_utility.h"

+ 0 - 11
package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_mixer_manager_alsa_linux_cc

@@ -1,11 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc	2013-09-11 01:15:17.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -8,6 +8,8 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
-+#define _POSIX_SOURCE
-+
- #include <cassert>
- 
- #include "audio_mixer_manager_alsa_linux.h"

+ 0 - 23
package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc

@@ -1,23 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-12-05 17:07:50.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-03-16 10:56:09.000000000 +0100
-@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
-     WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
-                  "Available number of cores:%d", number_of_cores_);
- 
--#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
--    number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN));
--    WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
--                 "Available number of cores:%d", number_of_cores_);
--
- #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-     int name[] = {
-       CTL_HW,
-@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
-                    "Failed to get number of cores");
-       number_of_cores_ = 1;
-     }
--#elif defined(_SC_NPROCESSORS_ONLN)
--    number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN);
- #else
-     WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
-                  "No function to get number of cores");

+ 0 - 3385
package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp

@@ -1,3385 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-12-05 17:07:50.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-02-05 09:52:11.000000000 +0100
-@@ -1,1688 +1,1694 @@
--//Templated spread_sort library
--
--//          Copyright Steven J. Ross 2001 - 2009.
--// Distributed under the Boost Software License, Version 1.0.
--//    (See accompanying file LICENSE_1_0.txt or copy at
--//          http://www.boost.org/LICENSE_1_0.txt)
--
--//  See http://www.boost.org/ for updates, documentation, and revision history.
--		  
--/*
--Some improvements suggested by:
--Phil Endecott and Frank Gennari
--Cygwin fix provided by:
--Scott McMurray
--*/
--
--#ifndef BOOST_SPREAD_SORT_H
--#define BOOST_SPREAD_SORT_H
--#include <algorithm>
--#include <cstring>
--#include <vector>
--#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
--
--namespace boost {
--  namespace detail {
--  	//This only works on unsigned data types
--  	template <typename T>
--  	inline unsigned 
--  	rough_log_2_size(const T& input) 
--  	{
--  		unsigned result = 0;
--  		//The && is necessary on some compilers to avoid infinite loops; it doesn't significantly impair performance
--  		while((input >> result) && (result < (8*sizeof(T)))) ++result;
--  		return result;
--  	}
--
--  	//Gets the maximum size which we'll call spread_sort on to control worst-case performance
--  	//Maintains both a minimum size to recurse and a check of distribution size versus count
--  	//This is called for a set of bins, instead of bin-by-bin, to avoid performance overhead
--  	inline size_t
--  	get_max_count(unsigned log_range, size_t count)
--  	{
--  		unsigned divisor = rough_log_2_size(count);
--  		//Making sure the divisor is positive
--  		if(divisor > LOG_MEAN_BIN_SIZE)
--  			divisor -= LOG_MEAN_BIN_SIZE;
--  		else
--  			divisor = 1;
--  		unsigned relative_width = (LOG_CONST * log_range)/((divisor > MAX_SPLITS) ? MAX_SPLITS : divisor);
--  		//Don't try to bitshift more than the size of an element
--  		if((8*sizeof(size_t)) <= relative_width)
--  			relative_width = (8*sizeof(size_t)) - 1;
--  		return (size_t)1 << ((relative_width < (LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT)) ? 
--  			(LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT) :  relative_width);
--  	}
--
--  	//Find the minimum and maximum using <
--  	template <class RandomAccessIter>
--  	inline void 
--  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min)
--  	{
--  		min = max = current;
--  		//Start from the second item, as max and min are initialized to the first
--  		while(++current < last) {
--  			if(*max < *current)
--  				max = current;
--  			else if(*current < *min)
--  				min = current;
--  		}
--  	}
--
--  	//Uses a user-defined comparison operator to find minimum and maximum
--  	template <class RandomAccessIter, class compare>
--  	inline void 
--  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min, compare comp)
--  	{
--  		min = max = current;
--  		while(++current < last) {
--  			if(comp(*max, *current))
--  				max = current;
--  			else if(comp(*current, *min))
--  				min = current;
--  		}
--  	}
--
--  	//Gets a non-negative right bit shift to operate as a logarithmic divisor
--  	inline int
--  	get_log_divisor(size_t count, unsigned log_range)
--  	{
--  		int log_divisor;
--  		//If we can finish in one iteration without exceeding either (2 to the MAX_SPLITS) or n bins, do so
--  		if((log_divisor = log_range - rough_log_2_size(count)) <= 0 && log_range < MAX_SPLITS)
--  			log_divisor = 0;
--  		else {
--  			//otherwise divide the data into an optimized number of pieces
--  			log_divisor += LOG_MEAN_BIN_SIZE;
--  			if(log_divisor < 0)
--  				log_divisor = 0;
--  			//Cannot exceed MAX_SPLITS or cache misses slow down bin lookups dramatically
--  			if((log_range - log_divisor) > MAX_SPLITS)
--  				log_divisor = log_range - MAX_SPLITS;
--  		}
--  		return log_divisor;
--  	}
--
--  	template <class RandomAccessIter>
--  	inline RandomAccessIter * 
--  	size_bins(std::vector<size_t> &bin_sizes, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset, unsigned &cache_end, unsigned bin_count)
--  	{
--  		//Assure space for the size of each bin, followed by initializing sizes
--  		if(bin_count > bin_sizes.size())
--  			bin_sizes.resize(bin_count);
--  		for(size_t u = 0; u < bin_count; u++)
--  			bin_sizes[u] = 0;
--  		//Make sure there is space for the bins
--  		cache_end = cache_offset + bin_count;
--  		if(cache_end > bin_cache.size())
--  			bin_cache.resize(cache_end);
--  		return &(bin_cache[cache_offset]);
--  	}
--
--  	//Implementation for recursive integer sorting
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void 
--  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  				  , std::vector<size_t> &bin_sizes)
--  	{
--  		//This step is roughly 10% of runtime, but it helps avoid worst-case behavior and improve behavior with real data
--  		//If you know the maximum and minimum ahead of time, you can pass those values in and skip this step for the first iteration
--  		RandomAccessIter max, min;
--  		find_extremes(first, last, max, min);
--  		//max and min will be the same (the first item) iff all values are equivalent
--  		if(max == min)
--  			return;
--  		RandomAccessIter * target_bin;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(*max >> 0) - (*min >> 0)));
--  		div_type div_min = *min >> log_divisor;
--  		div_type div_max = *max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  	
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[(*(current++) >> log_divisor) - div_min]++;
--  		//Assign the bin positions
--  		bins[0] = first;
--  		for(unsigned u = 0; u < bin_count - 1; u++)
--  			bins[u + 1] = bins[u] + bin_sizes[u];
--  
--  		//Swap into place
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count - 1; ++u) {
--  			RandomAccessIter * local_bin = bins + u;
--  			nextbinstart += bin_sizes[u];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = (bins + ((*current >> log_divisor) - div_min));  target_bin != local_bin; 
--  					target_bin = bins + ((*current >> log_divisor) - div_min)) {
--  					//3-way swap; this is about 1% faster than a 2-way swap with integers
--  					//The main advantage is less copies are involved per item put in the correct place
--  					data_type tmp;
--  					RandomAccessIter b = (*target_bin)++;
--  					RandomAccessIter * b_bin = bins + ((*b >> log_divisor) - div_min);
--  					if (b_bin != local_bin) {
--  						RandomAccessIter c = (*b_bin)++;
--  						tmp = *c;
--  						*c = *b;
--  					} 
--  					else
--  						tmp = *b;
--  					*b = *current;
--  					*current = tmp;
--  				}
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[bin_count - 1] = last;
--  
--  		//If we've bucketsorted, the array is sorted and we should skip recursion
--  		if(!log_divisor)
--  			return;
--  
--  		//Recursing; log_divisor is the remaining range
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			else
--  				spread_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//Generic bitshift-based 3-way swapping code
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void inner_swap_loop(RandomAccessIter * bins, const RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift
--  		, const unsigned log_divisor, const div_type div_min) 
--  	{
--  		RandomAccessIter * local_bin = bins + ii;
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			for(RandomAccessIter * target_bin = (bins + (shift(*current, log_divisor) - div_min));  target_bin != local_bin; 
--  				target_bin = bins + (shift(*current, log_divisor) - div_min)) {
--  				data_type tmp;
--  				RandomAccessIter b = (*target_bin)++;
--  				RandomAccessIter * b_bin = bins + (shift(*b, log_divisor) - div_min);
--  				//Three-way swap; if the item to be swapped doesn't belong in the current bin, swap it to where it belongs
--  				if (b_bin != local_bin) {
--  					RandomAccessIter c = (*b_bin)++;
--  					tmp = *c;
--  					*c = *b;
--  				} 
--  				//Note: we could increment current once the swap is done in this case, but that seems to impair performance
--  				else
--  					tmp = *b;
--  				*b = *current;
--  				*current = tmp;
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  	}
--
--  	//Standard swapping wrapper for ascending values
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void swap_loop(RandomAccessIter * bins, RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift
--  		, const std::vector<size_t> &bin_sizes, const unsigned log_divisor, const div_type div_min) 
--  	{
--  		nextbinstart += bin_sizes[ii];
--  		inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, log_divisor, div_min);
--  	}
--
--  	//Functor implementation for recursive sorting
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
--  	inline void 
--  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
--  	{
--  		RandomAccessIter max, min;
--  		find_extremes(first, last, max, min, comp);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));
--  		div_type div_min = shift(*min, log_divisor);
--  		div_type div_max = shift(*max, log_divisor);
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		bins[0] = first;
--  		for(unsigned u = 0; u < bin_count - 1; u++)
--  			bins[u + 1] = bins[u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count - 1; ++u)
--  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, bin_sizes, log_divisor, div_min);
--  		bins[bin_count - 1] = last;
--  		
--  		//If we've bucketsorted, the array is sorted and we should skip recursion
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u], comp);
--  			else
--  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift, comp);
--  		}
--  	}
--
--  	//Functor implementation for recursive sorting with only Shift overridden
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void 
--  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift)
--  	{
--  		RandomAccessIter max, min;
--  		find_extremes(first, last, max, min);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));
--  		div_type div_min = shift(*min, log_divisor);
--  		div_type div_max = shift(*max, log_divisor);
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		bins[0] = first;
--  		for(unsigned u = 0; u < bin_count - 1; u++)
--  			bins[u + 1] = bins[u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned ii = 0; ii < bin_count - 1; ++ii)
--  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
--  		bins[bin_count - 1] = last;
--  		
--  		//If we've bucketsorted, the array is sorted and we should skip recursion
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			else
--  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift);
--  		}
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void 
--  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		spread_sort_rec<RandomAccessIter, div_type, data_type>(first, last, bin_cache, 0, bin_sizes);
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
--  	inline void 
--  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift, compare comp)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(first, last, bin_cache, 0, bin_sizes, shift, comp);
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void 
--  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift);
--  	}
--  }
--
--  //Top-level sorting call for integers
--  template <class RandomAccessIter>
--  inline void integer_sort(RandomAccessIter first, RandomAccessIter last) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else
--  		detail::spread_sort(first, last, *first >> 0, *first);
--  }
--
--  //integer_sort with functors
--  template <class RandomAccessIter, class right_shift, class compare>
--  inline void integer_sort(RandomAccessIter first, RandomAccessIter last,
--  						right_shift shift, compare comp) {
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last, comp);
--  	else
--  		detail::spread_sort(first, last, shift(*first, 0), *first, shift, comp);
--  }
--
--  //integer_sort with right_shift functor
--  template <class RandomAccessIter, class right_shift>
--  inline void integer_sort(RandomAccessIter first, RandomAccessIter last,
--  						right_shift shift) {
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else
--  		detail::spread_sort(first, last, shift(*first, 0), *first, shift);
--  }
--
--  //------------------------------------------------------ float_sort source --------------------------------------
--  //Casts a RandomAccessIter to the specified data type
--  template<class cast_type, class RandomAccessIter>
--  inline cast_type
--  cast_float_iter(const RandomAccessIter & floatiter)
--  {
--  	cast_type result;
--  	std::memcpy(&result, &(*floatiter), sizeof(cast_type));
--  	return result;
--  }
--
--  //Casts a data element to the specified datinner_float_a type
--  template<class data_type, class cast_type>
--  inline cast_type
--  mem_cast(const data_type & data)
--  {
--  	cast_type result;
--  	std::memcpy(&result, &data, sizeof(cast_type));
--  	return result;
--  }
--
--  namespace detail {
--  	template <class RandomAccessIter, class div_type, class right_shift>
--  	inline void 
--  	find_extremes(RandomAccessIter current, RandomAccessIter last, div_type & max, div_type & min, right_shift shift)
--  	{
--  		min = max = shift(*current, 0);
--  		while(++current < last) {
--  			div_type value = shift(*current, 0);
--  			if(max < value)
--  				max = value;
--  			else if(value < min)
--  				min = value;
--  		}
--  	}
--
--  	//Specialized swap loops for floating-point casting
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void inner_float_swap_loop(RandomAccessIter * bins, const RandomAccessIter & nextbinstart, unsigned ii
--  		, const unsigned log_divisor, const div_type div_min) 
--  	{
--  		RandomAccessIter * local_bin = bins + ii;
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			for(RandomAccessIter * target_bin = (bins + ((cast_float_iter<div_type, RandomAccessIter>(current) >> log_divisor) - div_min));  target_bin != local_bin; 
--  				target_bin = bins + ((cast_float_iter<div_type, RandomAccessIter>(current) >> log_divisor) - div_min)) {
--  				data_type tmp;
--  				RandomAccessIter b = (*target_bin)++;
--  				RandomAccessIter * b_bin = bins + ((cast_float_iter<div_type, RandomAccessIter>(b) >> log_divisor) - div_min);
--  				//Three-way swap; if the item to be swapped doesn't belong in the current bin, swap it to where it belongs
--  				if (b_bin != local_bin) {
--  					RandomAccessIter c = (*b_bin)++;
--  					tmp = *c;
--  					*c = *b;
--  				} 
--  				else
--  					tmp = *b;
--  				*b = *current;
--  				*current = tmp;
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void float_swap_loop(RandomAccessIter * bins, RandomAccessIter & nextbinstart, unsigned ii
--  		, const std::vector<size_t> &bin_sizes, const unsigned log_divisor, const div_type div_min) 
--  	{
--  		nextbinstart += bin_sizes[ii];
--  		inner_float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, ii, log_divisor, div_min);
--  	}
--
--  	template <class RandomAccessIter, class cast_type>
--  	inline void 
--  	find_extremes(RandomAccessIter current, RandomAccessIter last, cast_type & max, cast_type & min)
--  	{
--  		min = max = cast_float_iter<cast_type, RandomAccessIter>(current);
--  		while(++current < last) {
--  			cast_type value = cast_float_iter<cast_type, RandomAccessIter>(current);
--  			if(max < value)
--  				max = value;
--  			else if(value < min)
--  				min = value;
--  		}
--  	}
--
--  	//Special-case sorting of positive floats with casting instead of a right_shift
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void 
--  	positive_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
--  		bins[0] = first;
--  		for(unsigned u = 0; u < bin_count - 1; u++)
--  			bins[u + 1] = bins[u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count - 1; ++u)
--  			float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, u, bin_sizes, log_divisor, div_min);
--  		bins[bin_count - 1] = last;
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			else
--  				positive_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//Sorting negative_ float_s
--  	//Note that bins are iterated in reverse order because max_neg_float = min_neg_int
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void 
--  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
--  		bins[bin_count - 1] = first;
--  		for(int ii = bin_count - 2; ii >= 0; --ii)
--  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//The last bin will always have the correct elements in it
--  		for(int ii = bin_count - 1; ii > 0; --ii)
--  			float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, ii, bin_sizes, log_divisor, div_min);
--  		//Since we don't process the last bin, we need to update its end position
--  		bin_cache[cache_offset] = last;
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii]);
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//Sorting negative_ float_s
--  	//Note that bins are iterated in reverse order because max_neg_float = min_neg_int
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void 
--  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min, shift);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		bins[bin_count - 1] = first;
--  		for(int ii = bin_count - 2; ii >= 0; --ii)
--  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//The last bin will always have the correct elements in it
--  		for(int ii = bin_count - 1; ii > 0; --ii)
--  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
--  		//Since we don't process the last bin, we need to update its end position
--  		bin_cache[cache_offset] = last;
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii]);
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift);
--  		}
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
--  	inline void 
--  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min, shift);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		bins[bin_count - 1] = first;
--  		for(int ii = bin_count - 2; ii >= 0; --ii)
--  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//The last bin will always have the correct elements in it
--  		for(int ii = bin_count - 1; ii > 0; --ii)
--  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
--  		//Since we don't process the last bin, we need to update its end position
--  		bin_cache[cache_offset] = last;
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Recursing
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii], comp);
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift, comp);
--  		}
--  	}
--
--  	//Casting special-case for floating-point sorting
--  	template <class RandomAccessIter, class div_type, class data_type>
--  	inline void 
--  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
--  		//The index of the first positive bin
--  		div_type first_positive = (div_min < 0) ? -div_min : 0;
--  		//Resetting if all bins are negative
--  		if(cache_offset + first_positive > cache_end)
--  			first_positive = cache_end - cache_offset;
--  		//Reversing the order of the negative bins
--  		//Note that because of the negative/positive ordering direction flip
--  		//We can not depend upon bin order and positions matching up
--  		//so bin_sizes must be reused to contain the end of the bin
--  		if(first_positive > 0) {
--  			bins[first_positive - 1] = first;
--  			for(int ii = first_positive - 2; ii >= 0; --ii) {
--  				bins[ii] = first + bin_sizes[ii + 1];
--  				bin_sizes[ii] += bin_sizes[ii + 1];
--  			}
--  			//Handling positives following negatives
--  			if((unsigned)first_positive < bin_count) {
--  				bins[first_positive] = first + bin_sizes[0];
--  				bin_sizes[first_positive] += bin_sizes[0];
--  			}
--  		}
--  		else
--  			bins[0] = first;
--  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
--  			bins[u + 1] = first + bin_sizes[u];
--  			bin_sizes[u + 1] += bin_sizes[u];
--  		}
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count; ++u) {
--  			nextbinstart = first + bin_sizes[u];
--  			inner_float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, u, log_divisor, div_min);
--  		}
--  		
--  		if(!log_divisor)
--  			return;
--  		
--  		//Handling negative values first
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii]);
--  			//sort negative values using reversed-bin spread_sort
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes);
--  		}
--  		
--  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			//sort positive values using normal spread_sort
--  			else
--  				positive_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//Functor implementation for recursive sorting
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void 
--  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min, shift);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		//The index of the first positive bin
--  		div_type first_positive = (div_min < 0) ? -div_min : 0;
--  		//Resetting if all bins are negative
--  		if(cache_offset + first_positive > cache_end)
--  			first_positive = cache_end - cache_offset;
--  		//Reversing the order of the negative bins
--  		//Note that because of the negative/positive ordering direction flip
--  		//We can not depend upon bin order and positions matching up
--  		//so bin_sizes must be reused to contain the end of the bin
--  		if(first_positive > 0) {
--  			bins[first_positive - 1] = first;
--  			for(int ii = first_positive - 2; ii >= 0; --ii) {
--  				bins[ii] = first + bin_sizes[ii + 1];
--  				bin_sizes[ii] += bin_sizes[ii + 1];
--  			}
--  			//Handling positives following negatives
--  			if((unsigned)first_positive < bin_count) {
--  				bins[first_positive] = first + bin_sizes[0];
--  				bin_sizes[first_positive] += bin_sizes[0];
--  			}
--  		}
--  		else
--  			bins[0] = first;
--  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
--  			bins[u + 1] = first + bin_sizes[u];
--  			bin_sizes[u + 1] += bin_sizes[u];
--  		}
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count; ++u) {
--  			nextbinstart = first + bin_sizes[u];
--  			inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, log_divisor, div_min);
--  		}
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Handling negative values first
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii]);
--  			//sort negative values using reversed-bin spread_sort
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift);
--  		}
--  		
--  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			//sort positive values using normal spread_sort
--  			else
--  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift);
--  		}
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
--  	inline void 
--  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
--  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
--  	{
--  		div_type max, min;
--  		find_extremes(first, last, max, min, shift);
--  		if(max == min)
--  			return;
--  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
--  		div_type div_min = min >> log_divisor;
--  		div_type div_max = max >> log_divisor;
--  		unsigned bin_count = div_max - div_min + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
--  			
--  		//Calculating the size of each bin
--  		for (RandomAccessIter current = first; current != last;)
--  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
--  		//The index of the first positive bin
--  		div_type first_positive = (div_min < 0) ? -div_min : 0;
--  		//Resetting if all bins are negative
--  		if(cache_offset + first_positive > cache_end)
--  			first_positive = cache_end - cache_offset;
--  		//Reversing the order of the negative bins
--  		//Note that because of the negative/positive ordering direction flip
--  		//We can not depend upon bin order and positions matching up
--  		//so bin_sizes must be reused to contain the end of the bin
--  		if(first_positive > 0) {
--  			bins[first_positive - 1] = first;
--  			for(int ii = first_positive - 2; ii >= 0; --ii) {
--  				bins[ii] = first + bin_sizes[ii + 1];
--  				bin_sizes[ii] += bin_sizes[ii + 1];
--  			}
--  			//Handling positives following negatives
--  			if((unsigned)first_positive < bin_count) {
--  				bins[first_positive] = first + bin_sizes[0];
--  				bin_sizes[first_positive] += bin_sizes[0];
--  			}
--  		}
--  		else
--  			bins[0] = first;
--  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
--  			bins[u + 1] = first + bin_sizes[u];
--  			bin_sizes[u + 1] += bin_sizes[u];
--  		}
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		for(unsigned u = 0; u < bin_count; ++u) {
--  			nextbinstart = first + bin_sizes[u];
--  			inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, log_divisor, div_min);
--  		}
--  		
--  		//Return if we've completed bucketsorting
--  		if(!log_divisor)
--  			return;
--  		
--  		//Handling negative values first
--  		size_t max_count = get_max_count(log_divisor, last - first);
--  		RandomAccessIter lastPos = first;
--  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
--  			size_t count = bin_cache[ii] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[ii]);
--  			//sort negative values using reversed-bin spread_sort
--  			else
--  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift, comp);
--  		}
--  		
--  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			if(count < 2)
--  				continue;
--  			if(count < max_count)
--  				std::sort(lastPos, bin_cache[u]);
--  			//sort positive values using normal spread_sort
--  			else
--  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift, comp);
--  		}
--  	}
--
--  	template <class RandomAccessIter, class cast_type, class data_type>
--  	inline void 
--  	float_Sort(RandomAccessIter first, RandomAccessIter last, cast_type, data_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		float_sort_rec<RandomAccessIter, cast_type, data_type>(first, last, bin_cache, 0, bin_sizes);
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
--  	inline void 
--  	float_Sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift);
--  	}
--
--  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
--  	inline void 
--  	float_Sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift, compare comp)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift, comp);
--  	}
--  }
--
--  //float_sort with casting
--  //The cast_type must be equal in size to the data type, and must be a signed integer
--  template <class RandomAccessIter, class cast_type>
--  inline void float_sort_cast(RandomAccessIter first, RandomAccessIter last, cast_type cVal) 
--  {
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else
--  		detail::float_Sort(first, last, cVal, *first);
--  }
--
--  //float_sort with casting to an int
--  //Only use this with IEEE floating-point numbers
--  template <class RandomAccessIter>
--  inline void float_sort_cast_to_int(RandomAccessIter first, RandomAccessIter last) 
--  {
--  	int cVal = 0;
--  	float_sort_cast(first, last, cVal);
--  }
--
--  //float_sort with functors
--  template <class RandomAccessIter, class right_shift>
--  inline void float_sort(RandomAccessIter first, RandomAccessIter last, right_shift shift) 
--  {
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else
--  		detail::float_Sort(first, last, shift(*first, 0), *first, shift);
--  }
--
--  template <class RandomAccessIter, class right_shift, class compare>
--  inline void float_sort(RandomAccessIter first, RandomAccessIter last, right_shift shift, compare comp) 
--  {
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last, comp);
--  	else
--  		detail::float_Sort(first, last, shift(*first, 0), *first, shift, comp);
--  }
--
--  //------------------------------------------------- string_sort source ---------------------------------------------
--  namespace detail {
--  	//Offsetting on identical characters.  This function works a character at a time for optimal worst-case performance.
--  	template<class RandomAccessIter>
--  	inline void
--  	update_offset(RandomAccessIter first, RandomAccessIter finish, unsigned &char_offset)
--  	{
--  		unsigned nextOffset = char_offset;
--  		bool done = false;
--  		while(!done) {
--  			RandomAccessIter curr = first;
--  			do {
--  				//ignore empties, but if the nextOffset would exceed the length or not match, exit; we've found the last matching character
--  				if((*curr).size() > char_offset && ((*curr).size() <= (nextOffset + 1) || (*curr)[nextOffset] != (*first)[nextOffset])) {
--  					done = true;
--  					break;
--  				}
--  			} while(++curr != finish);
--  			if(!done)
--  				++nextOffset;
--  		} 
--  		char_offset = nextOffset;
--  	}
--
--  	//Offsetting on identical characters.  This function works a character at a time for optimal worst-case performance.
--  	template<class RandomAccessIter, class get_char, class get_length>
--  	inline void
--  	update_offset(RandomAccessIter first, RandomAccessIter finish, unsigned &char_offset, get_char getchar, get_length length)
--  	{
--  		unsigned nextOffset = char_offset;
--  		bool done = false;
--  		while(!done) {
--  			RandomAccessIter curr = first;
--  			do {
--  				//ignore empties, but if the nextOffset would exceed the length or not match, exit; we've found the last matching character
--  				if(length(*curr) > char_offset && (length(*curr) <= (nextOffset + 1) || getchar((*curr), nextOffset) != getchar((*first), nextOffset))) {
--  					done = true;
--  					break;
--  				}
--  			} while(++curr != finish);
--  			if(!done)
--  				++nextOffset;
--  		} 
--  		char_offset = nextOffset;
--  	}
--
--  	//A comparison functor for strings that assumes they are identical up to char_offset
--  	template<class data_type, class unsignedchar_type>
--  	struct offset_lessthan {
--  		offset_lessthan(unsigned char_offset) : fchar_offset(char_offset){}
--  		inline bool operator()(const data_type &x, const data_type &y) const 
--  		{
--  			unsigned minSize = std::min(x.size(), y.size());
--  			for(unsigned u = fchar_offset; u < minSize; ++u) {
--  				if(static_cast<unsignedchar_type>(x[u]) < static_cast<unsignedchar_type>(y[u]))
--  					return true;
--  				else if(static_cast<unsignedchar_type>(y[u]) < static_cast<unsignedchar_type>(x[u]))
--  					return false;
--  			}
--  			return x.size() < y.size();
--  		}
--  		unsigned fchar_offset;
--  	};
--
--  	//A comparison functor for strings that assumes they are identical up to char_offset
--  	template<class data_type, class unsignedchar_type>
--  	struct offset_greaterthan {
--  		offset_greaterthan(unsigned char_offset) : fchar_offset(char_offset){}
--  		inline bool operator()(const data_type &x, const data_type &y) const 
--  		{
--  			unsigned minSize = std::min(x.size(), y.size());
--  			for(unsigned u = fchar_offset; u < minSize; ++u) {
--  				if(static_cast<unsignedchar_type>(x[u]) > static_cast<unsignedchar_type>(y[u]))
--  					return true;
--  				else if(static_cast<unsignedchar_type>(y[u]) > static_cast<unsignedchar_type>(x[u]))
--  					return false;
--  			}
--  			return x.size() > y.size();
--  		}
--  		unsigned fchar_offset;
--  	};
--
--  	//A comparison functor for strings that assumes they are identical up to char_offset
--  	template<class data_type, class get_char, class get_length>
--  	struct offset_char_lessthan {
--  		offset_char_lessthan(unsigned char_offset) : fchar_offset(char_offset){}
--  		inline bool operator()(const data_type &x, const data_type &y) const 
--  		{
--  			unsigned minSize = std::min(length(x), length(y));
--  			for(unsigned u = fchar_offset; u < minSize; ++u) {
--  				if(getchar(x, u) < getchar(y, u))
--  					return true;
--  				else if(getchar(y, u) < getchar(x, u))
--  					return false;
--  			}
--  			return length(x) < length(y);
--  		}
--  		unsigned fchar_offset;
--  		get_char getchar;
--  		get_length length;
--  	};
--
--  	//String sorting recursive implementation
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
--  	inline void 
--  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
--  		, unsigned cache_offset, std::vector<size_t> &bin_sizes)
--  	{
--  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
--  		//Iterate to the end of the empties.  If all empty, return
--  		while((*first).size() <= char_offset) {
--  			if(++first == last)
--  				return;
--  		}
--  		RandomAccessIter finish = last - 1;
--  		//Getting the last non-empty
--  		for(;(*finish).size() <= char_offset; --finish) { }
--  		++finish;
--  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
--  		update_offset(first, finish, char_offset);
--  		
--  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
--  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
--  		const unsigned max_size = bin_count;
--  		const unsigned membin_count = bin_count + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
--  			
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last; ++current) {
--  			if((*current).size() <= char_offset) {
--  				bin_sizes[0]++;
--  			}
--  			else
--  				bin_sizes[static_cast<unsignedchar_type>((*current)[char_offset]) + 1]++;
--  		}
--  		//Assign the bin positions
--  		bin_cache[cache_offset] = first;
--  		for(unsigned u = 0; u < membin_count - 1; u++)
--  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//handling empty bins
--  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
--  		nextbinstart +=	bin_sizes[0];
--  		RandomAccessIter * target_bin;
--  		//Iterating over each element in the bin of empties
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			//empties belong in this bin
--  			while((*current).size() > char_offset) {
--  				target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]);
--  				iter_swap(current, (*target_bin)++);
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
--  		unsigned last_bin = bin_count - 1;
--  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		for(unsigned u = 0; u < last_bin; ++u) {
--  			local_bin = bins + u;
--  			nextbinstart += bin_sizes[u + 1];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]);  target_bin != local_bin; 
--  					target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]))
--  					iter_swap(current, (*target_bin)++);
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[last_bin] = last;
--  		//Recursing
--  		RandomAccessIter lastPos = bin_cache[cache_offset];
--  		//Skip this loop for empties
--  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_size)
--  				std::sort(lastPos, bin_cache[u], offset_lessthan<data_type, unsignedchar_type>(char_offset + 1));
--  			else
--  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//Sorts strings in reverse order, with empties at the end
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
--  	inline void 
--  	reverse_string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
--  		, unsigned cache_offset, std::vector<size_t> &bin_sizes)
--  	{
--  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
--  		RandomAccessIter curr = first;
--  		//Iterate to the end of the empties.  If all empty, return
--  		while((*curr).size() <= char_offset) {
--  			if(++curr == last)
--  				return;
--  		}
--  		//Getting the last non-empty
--  		while((*(--last)).size() <= char_offset) { }
--  		++last;
--  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
--  		update_offset(curr, last, char_offset);
--  		RandomAccessIter * target_bin;
--  		
--  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
--  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
--  		const unsigned max_size = bin_count;
--  		const unsigned membin_count = bin_count + 1;
--  		const unsigned max_bin = bin_count - 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count);
--  		RandomAccessIter * end_bin = &(bin_cache[cache_offset + max_bin]);
--  			
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last; ++current) {
--  			if((*current).size() <= char_offset) {
--  				bin_sizes[bin_count]++;
--  			}
--  			else
--  				bin_sizes[max_bin - static_cast<unsignedchar_type>((*current)[char_offset])]++;
--  		}
--  		//Assign the bin positions
--  		bin_cache[cache_offset] = first;
--  		for(unsigned u = 0; u < membin_count - 1; u++)
--  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = last;
--  		//handling empty bins
--  		RandomAccessIter * local_bin = &(bin_cache[cache_offset + bin_count]);
--  		RandomAccessIter lastFull = *local_bin;
--  		//Iterating over each element in the bin of empties
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			//empties belong in this bin
--  			while((*current).size() > char_offset) {
--  				target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]);
--  				iter_swap(current, (*target_bin)++);
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  		nextbinstart = first;
--  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
--  		unsigned last_bin = max_bin;
--  		for(; last_bin && !bin_sizes[last_bin]; --last_bin) { }
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		for(unsigned u = 0; u < last_bin; ++u) {
--  			local_bin = bins + u;
--  			nextbinstart += bin_sizes[u];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]);  target_bin != local_bin; 
--  					target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]))
--  					iter_swap(current, (*target_bin)++);
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[last_bin] = lastFull;
--  		//Recursing
--  		RandomAccessIter lastPos = first;
--  		//Skip this loop for empties
--  		for(unsigned u = cache_offset; u <= cache_offset + last_bin; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_size)
--  				std::sort(lastPos, bin_cache[u], offset_greaterthan<data_type, unsignedchar_type>(char_offset + 1));
--  			else
--  				reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes);
--  		}
--  	}
--
--  	//String sorting recursive implementation
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length>
--  	inline void 
--  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
--  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length)
--  	{
--  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
--  		//Iterate to the end of the empties.  If all empty, return
--  		while(length(*first) <= char_offset) {
--  			if(++first == last)
--  				return;
--  		}
--  		RandomAccessIter finish = last - 1;
--  		//Getting the last non-empty
--  		for(;length(*finish) <= char_offset; --finish) { }
--  		++finish;
--  		update_offset(first, finish, char_offset, getchar, length);
--  		
--  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
--  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
--  		const unsigned max_size = bin_count;
--  		const unsigned membin_count = bin_count + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
--  			
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last; ++current) {
--  			if(length(*current) <= char_offset) {
--  				bin_sizes[0]++;
--  			}
--  			else
--  				bin_sizes[getchar((*current), char_offset) + 1]++;
--  		}
--  		//Assign the bin positions
--  		bin_cache[cache_offset] = first;
--  		for(unsigned u = 0; u < membin_count - 1; u++)
--  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//handling empty bins
--  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
--  		nextbinstart +=	bin_sizes[0];
--  		RandomAccessIter * target_bin;
--  		//Iterating over each element in the bin of empties
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			//empties belong in this bin
--  			while(length(*current) > char_offset) {
--  				target_bin = bins + getchar((*current), char_offset);
--  				iter_swap(current, (*target_bin)++);
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
--  		unsigned last_bin = bin_count - 1;
--  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		for(unsigned ii = 0; ii < last_bin; ++ii) {
--  			local_bin = bins + ii;
--  			nextbinstart += bin_sizes[ii + 1];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = bins + getchar((*current), char_offset);  target_bin != local_bin; 
--  					target_bin = bins + getchar((*current), char_offset))
--  					iter_swap(current, (*target_bin)++);
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[last_bin] = last;
--  		
--  		//Recursing
--  		RandomAccessIter lastPos = bin_cache[cache_offset];
--  		//Skip this loop for empties
--  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_size)
--  				std::sort(lastPos, bin_cache[u], offset_char_lessthan<data_type, get_char, get_length>(char_offset + 1));
--  			else
--  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length);
--  		}
--  	}
--
--  	//String sorting recursive implementation
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length, class compare>
--  	inline void 
--  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
--  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length, compare comp)
--  	{
--  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
--  		//Iterate to the end of the empties.  If all empty, return
--  		while(length(*first) <= char_offset) {
--  			if(++first == last)
--  				return;
--  		}
--  		RandomAccessIter finish = last - 1;
--  		//Getting the last non-empty
--  		for(;length(*finish) <= char_offset; --finish) { }
--  		++finish;
--  		update_offset(first, finish, char_offset, getchar, length);
--  		
--  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
--  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
--  		const unsigned max_size = bin_count;
--  		const unsigned membin_count = bin_count + 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
--  			
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last; ++current) {
--  			if(length(*current) <= char_offset) {
--  				bin_sizes[0]++;
--  			}
--  			else
--  				bin_sizes[getchar((*current), char_offset) + 1]++;
--  		}
--  		//Assign the bin positions
--  		bin_cache[cache_offset] = first;
--  		for(unsigned u = 0; u < membin_count - 1; u++)
--  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = first;
--  		//handling empty bins
--  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
--  		nextbinstart +=	bin_sizes[0];
--  		RandomAccessIter * target_bin;
--  		//Iterating over each element in the bin of empties
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			//empties belong in this bin
--  			while(length(*current) > char_offset) {
--  				target_bin = bins + getchar((*current), char_offset);
--  				iter_swap(current, (*target_bin)++);
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
--  		unsigned last_bin = bin_count - 1;
--  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		for(unsigned u = 0; u < last_bin; ++u) {
--  			local_bin = bins + u;
--  			nextbinstart += bin_sizes[u + 1];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = bins + getchar((*current), char_offset);  target_bin != local_bin; 
--  					target_bin = bins + getchar((*current), char_offset))
--  					iter_swap(current, (*target_bin)++);
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[last_bin] = last;
--  		
--  		//Recursing
--  		RandomAccessIter lastPos = bin_cache[cache_offset];
--  		//Skip this loop for empties
--  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_size)
--  				std::sort(lastPos, bin_cache[u], comp);
--  			else
--  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(lastPos
--  					, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length, comp);
--  		}
--  	}
--
--  	//Sorts strings in reverse order, with empties at the end
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length, class compare>
--  	inline void 
--  	reverse_string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
--  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length, compare comp)
--  	{
--  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
--  		RandomAccessIter curr = first;
--  		//Iterate to the end of the empties.  If all empty, return
--  		while(length(*curr) <= char_offset) {
--  			if(++curr == last)
--  				return;
--  		}
--  		//Getting the last non-empty
--  		while(length(*(--last)) <= char_offset) { }
--  		++last;
--  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
--  		update_offset(first, last, char_offset, getchar, length);
--  		
--  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
--  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
--  		const unsigned max_size = bin_count;
--  		const unsigned membin_count = bin_count + 1;
--  		const unsigned max_bin = bin_count - 1;
--  		unsigned cache_end;
--  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count);
--  		RandomAccessIter *end_bin = &(bin_cache[cache_offset + max_bin]);
--  			
--  		//Calculating the size of each bin; this takes roughly 10% of runtime
--  		for (RandomAccessIter current = first; current != last; ++current) {
--  			if(length(*current) <= char_offset) {
--  				bin_sizes[bin_count]++;
--  			}
--  			else
--  				bin_sizes[max_bin - getchar((*current), char_offset)]++;
--  		}
--  		//Assign the bin positions
--  		bin_cache[cache_offset] = first;
--  		for(unsigned u = 0; u < membin_count - 1; u++)
--  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
--  		
--  		//Swap into place
--  		RandomAccessIter nextbinstart = last;
--  		//handling empty bins
--  		RandomAccessIter * local_bin = &(bin_cache[cache_offset + bin_count]);
--  		RandomAccessIter lastFull = *local_bin;
--  		RandomAccessIter * target_bin;
--  		//Iterating over each element in the bin of empties
--  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  			//empties belong in this bin
--  			while(length(*current) > char_offset) {
--  				target_bin = end_bin - getchar((*current), char_offset);
--  				iter_swap(current, (*target_bin)++);
--  			}
--  		}
--  		*local_bin = nextbinstart;
--  		nextbinstart = first;
--  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
--  		unsigned last_bin = max_bin;
--  		for(; last_bin && !bin_sizes[last_bin]; --last_bin) { }
--  		//This dominates runtime, mostly in the swap and bin lookups
--  		for(unsigned u = 0; u < last_bin; ++u) {
--  			local_bin = bins + u;
--  			nextbinstart += bin_sizes[u];
--  			//Iterating over each element in this bin
--  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
--  				//Swapping elements in current into place until the correct element has been swapped in
--  				for(target_bin = end_bin - getchar((*current), char_offset);  target_bin != local_bin; 
--  					target_bin = end_bin - getchar((*current), char_offset))
--  					iter_swap(current, (*target_bin)++);
--  			}
--  			*local_bin = nextbinstart;
--  		}
--  		bins[last_bin] = lastFull;
--  		//Recursing
--  		RandomAccessIter lastPos = first;
--  		//Skip this loop for empties
--  		for(unsigned u = cache_offset; u <= cache_offset + last_bin; lastPos = bin_cache[u], ++u) {
--  			size_t count = bin_cache[u] - lastPos;
--  			//don't sort unless there are at least two items to compare
--  			if(count < 2)
--  				continue;
--  			//using std::sort if its worst-case is better
--  			if(count < max_size)
--  				std::sort(lastPos, bin_cache[u], comp);
--  			else
--  				reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(lastPos
--  					, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length, comp);
--  		}
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
--  	inline void 
--  	string_sort(RandomAccessIter first, RandomAccessIter last, data_type, unsignedchar_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(first, last, 0, bin_cache, 0, bin_sizes);
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
--  	inline void 
--  	reverse_string_sort(RandomAccessIter first, RandomAccessIter last, data_type, unsignedchar_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(first, last, 0, bin_cache, 0, bin_sizes);
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class get_char, class get_length, class data_type, class unsignedchar_type>
--  	inline void 
--  	string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, data_type, unsignedchar_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length);
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class get_char, class get_length, class compare, class data_type, class unsignedchar_type>
--  	inline void 
--  	string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp, data_type, unsignedchar_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length, comp);
--  	}
--
--  	//Holds the bin vector and makes the initial recursive call
--  	template <class RandomAccessIter, class get_char, class get_length, class compare, class data_type, class unsignedchar_type>
--  	inline void 
--  	reverse_string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp, data_type, unsignedchar_type)
--  	{
--  		std::vector<size_t> bin_sizes;
--  		std::vector<RandomAccessIter> bin_cache;
--  		reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length, comp);
--  	}
--  }
--
--  //Allows character-type overloads
--  template <class RandomAccessIter, class unsignedchar_type>
--  inline void string_sort(RandomAccessIter first, RandomAccessIter last, unsignedchar_type unused) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else
--  		detail::string_sort(first, last, *first, unused);
--  }
--
--  //Top-level sorting call; wraps using default of unsigned char
--  template <class RandomAccessIter>
--  inline void string_sort(RandomAccessIter first, RandomAccessIter last) 
--  {
--  	unsigned char unused = '\0';
--  	string_sort(first, last, unused);
--  }
--
--  //Allows character-type overloads
--  template <class RandomAccessIter, class compare, class unsignedchar_type>
--  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, compare comp, unsignedchar_type unused) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last, comp);
--  	else
--  		detail::reverse_string_sort(first, last, *first, unused);
--  }
--
--  //Top-level sorting call; wraps using default of unsigned char
--  template <class RandomAccessIter, class compare>
--  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, compare comp) 
--  {
--  	unsigned char unused = '\0';
--  	reverse_string_sort(first, last, comp, unused);
--  }
--
--  template <class RandomAccessIter, class get_char, class get_length>
--  inline void string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last);
--  	else {
--  		//skipping past empties at the beginning, which allows us to get the character type 
--  		//.empty() is not used so as not to require a user declaration of it
--  		while(!length(*first)) {
--  			if(++first == last)
--  				return;
--  		}
--  		detail::string_sort(first, last, getchar, length, *first, getchar((*first), 0));
--  	}
--  }
--
--  template <class RandomAccessIter, class get_char, class get_length, class compare>
--  inline void string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last, comp);
--  	else {
--  		//skipping past empties at the beginning, which allows us to get the character type 
--  		//.empty() is not used so as not to require a user declaration of it
--  		while(!length(*first)) {
--  			if(++first == last)
--  				return;
--  		}
--  		detail::string_sort(first, last, getchar, length, comp, *first, getchar((*first), 0));
--  	}
--  }
--
--  template <class RandomAccessIter, class get_char, class get_length, class compare>
--  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp) 
--  {
--  	//Don't sort if it's too small to optimize
--  	if(last - first < detail::MIN_SORT_SIZE)
--  		std::sort(first, last, comp);
--  	else {
--  		//skipping past empties at the beginning, which allows us to get the character type 
--  		//.empty() is not used so as not to require a user declaration of it
--  		while(!length(*(--last))) {
--  			//Note: if there is just one non-empty, and it's at the beginning, then it's already in sorted order
--  			if(first == last)
--  				return;
--  		}
--  		//making last just after the end of the non-empty part of the array
--  		++last;
--  		detail::reverse_string_sort(first, last, getchar, length, comp, *first, getchar((*first), 0));
--  	}
--  }
--}
--
--#endif
-+//Templated spread_sort library
-+
-+//          Copyright Steven J. Ross 2001 - 2009.
-+// Distributed under the Boost Software License, Version 1.0.
-+//    (See accompanying file LICENSE_1_0.txt or copy at
-+//          http://www.boost.org/LICENSE_1_0.txt)
-+
-+//  See http://www.boost.org/ for updates, documentation, and revision history.
-+		  
-+/*
-+Some improvements suggested by:
-+Phil Endecott and Frank Gennari
-+Cygwin fix provided by:
-+Scott McMurray
-+*/
-+
-+#ifndef BOOST_SPREAD_SORT_H
-+#define BOOST_SPREAD_SORT_H
-+#include <algorithm>
-+#include <cstring>
-+#include <vector>
-+#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
-+
-+#include <features.h>
-+#if defined(__UCLIBC__)
-+#undef getchar
-+#endif
-+
-+
-+namespace boost {
-+  namespace detail {
-+  	//This only works on unsigned data types
-+  	template <typename T>
-+  	inline unsigned 
-+  	rough_log_2_size(const T& input) 
-+  	{
-+  		unsigned result = 0;
-+  		//The && is necessary on some compilers to avoid infinite loops; it doesn't significantly impair performance
-+  		while((input >> result) && (result < (8*sizeof(T)))) ++result;
-+  		return result;
-+  	}
-+
-+  	//Gets the maximum size which we'll call spread_sort on to control worst-case performance
-+  	//Maintains both a minimum size to recurse and a check of distribution size versus count
-+  	//This is called for a set of bins, instead of bin-by-bin, to avoid performance overhead
-+  	inline size_t
-+  	get_max_count(unsigned log_range, size_t count)
-+  	{
-+  		unsigned divisor = rough_log_2_size(count);
-+  		//Making sure the divisor is positive
-+  		if(divisor > LOG_MEAN_BIN_SIZE)
-+  			divisor -= LOG_MEAN_BIN_SIZE;
-+  		else
-+  			divisor = 1;
-+  		unsigned relative_width = (LOG_CONST * log_range)/((divisor > MAX_SPLITS) ? MAX_SPLITS : divisor);
-+  		//Don't try to bitshift more than the size of an element
-+  		if((8*sizeof(size_t)) <= relative_width)
-+  			relative_width = (8*sizeof(size_t)) - 1;
-+  		return (size_t)1 << ((relative_width < (LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT)) ? 
-+  			(LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT) :  relative_width);
-+  	}
-+
-+  	//Find the minimum and maximum using <
-+  	template <class RandomAccessIter>
-+  	inline void 
-+  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min)
-+  	{
-+  		min = max = current;
-+  		//Start from the second item, as max and min are initialized to the first
-+  		while(++current < last) {
-+  			if(*max < *current)
-+  				max = current;
-+  			else if(*current < *min)
-+  				min = current;
-+  		}
-+  	}
-+
-+  	//Uses a user-defined comparison operator to find minimum and maximum
-+  	template <class RandomAccessIter, class compare>
-+  	inline void 
-+  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min, compare comp)
-+  	{
-+  		min = max = current;
-+  		while(++current < last) {
-+  			if(comp(*max, *current))
-+  				max = current;
-+  			else if(comp(*current, *min))
-+  				min = current;
-+  		}
-+  	}
-+
-+  	//Gets a non-negative right bit shift to operate as a logarithmic divisor
-+  	inline int
-+  	get_log_divisor(size_t count, unsigned log_range)
-+  	{
-+  		int log_divisor;
-+  		//If we can finish in one iteration without exceeding either (2 to the MAX_SPLITS) or n bins, do so
-+  		if((log_divisor = log_range - rough_log_2_size(count)) <= 0 && log_range < MAX_SPLITS)
-+  			log_divisor = 0;
-+  		else {
-+  			//otherwise divide the data into an optimized number of pieces
-+  			log_divisor += LOG_MEAN_BIN_SIZE;
-+  			if(log_divisor < 0)
-+  				log_divisor = 0;
-+  			//Cannot exceed MAX_SPLITS or cache misses slow down bin lookups dramatically
-+  			if((log_range - log_divisor) > MAX_SPLITS)
-+  				log_divisor = log_range - MAX_SPLITS;
-+  		}
-+  		return log_divisor;
-+  	}
-+
-+  	template <class RandomAccessIter>
-+  	inline RandomAccessIter * 
-+  	size_bins(std::vector<size_t> &bin_sizes, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset, unsigned &cache_end, unsigned bin_count)
-+  	{
-+  		//Assure space for the size of each bin, followed by initializing sizes
-+  		if(bin_count > bin_sizes.size())
-+  			bin_sizes.resize(bin_count);
-+  		for(size_t u = 0; u < bin_count; u++)
-+  			bin_sizes[u] = 0;
-+  		//Make sure there is space for the bins
-+  		cache_end = cache_offset + bin_count;
-+  		if(cache_end > bin_cache.size())
-+  			bin_cache.resize(cache_end);
-+  		return &(bin_cache[cache_offset]);
-+  	}
-+
-+  	//Implementation for recursive integer sorting
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void 
-+  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  				  , std::vector<size_t> &bin_sizes)
-+  	{
-+  		//This step is roughly 10% of runtime, but it helps avoid worst-case behavior and improve behavior with real data
-+  		//If you know the maximum and minimum ahead of time, you can pass those values in and skip this step for the first iteration
-+  		RandomAccessIter max, min;
-+  		find_extremes(first, last, max, min);
-+  		//max and min will be the same (the first item) iff all values are equivalent
-+  		if(max == min)
-+  			return;
-+  		RandomAccessIter * target_bin;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(*max >> 0) - (*min >> 0)));
-+  		div_type div_min = *min >> log_divisor;
-+  		div_type div_max = *max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  	
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[(*(current++) >> log_divisor) - div_min]++;
-+  		//Assign the bin positions
-+  		bins[0] = first;
-+  		for(unsigned u = 0; u < bin_count - 1; u++)
-+  			bins[u + 1] = bins[u] + bin_sizes[u];
-+  
-+  		//Swap into place
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count - 1; ++u) {
-+  			RandomAccessIter * local_bin = bins + u;
-+  			nextbinstart += bin_sizes[u];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = (bins + ((*current >> log_divisor) - div_min));  target_bin != local_bin; 
-+  					target_bin = bins + ((*current >> log_divisor) - div_min)) {
-+  					//3-way swap; this is about 1% faster than a 2-way swap with integers
-+  					//The main advantage is less copies are involved per item put in the correct place
-+  					data_type tmp;
-+  					RandomAccessIter b = (*target_bin)++;
-+  					RandomAccessIter * b_bin = bins + ((*b >> log_divisor) - div_min);
-+  					if (b_bin != local_bin) {
-+  						RandomAccessIter c = (*b_bin)++;
-+  						tmp = *c;
-+  						*c = *b;
-+  					} 
-+  					else
-+  						tmp = *b;
-+  					*b = *current;
-+  					*current = tmp;
-+  				}
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[bin_count - 1] = last;
-+  
-+  		//If we've bucketsorted, the array is sorted and we should skip recursion
-+  		if(!log_divisor)
-+  			return;
-+  
-+  		//Recursing; log_divisor is the remaining range
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			else
-+  				spread_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//Generic bitshift-based 3-way swapping code
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void inner_swap_loop(RandomAccessIter * bins, const RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift
-+  		, const unsigned log_divisor, const div_type div_min) 
-+  	{
-+  		RandomAccessIter * local_bin = bins + ii;
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			for(RandomAccessIter * target_bin = (bins + (shift(*current, log_divisor) - div_min));  target_bin != local_bin; 
-+  				target_bin = bins + (shift(*current, log_divisor) - div_min)) {
-+  				data_type tmp;
-+  				RandomAccessIter b = (*target_bin)++;
-+  				RandomAccessIter * b_bin = bins + (shift(*b, log_divisor) - div_min);
-+  				//Three-way swap; if the item to be swapped doesn't belong in the current bin, swap it to where it belongs
-+  				if (b_bin != local_bin) {
-+  					RandomAccessIter c = (*b_bin)++;
-+  					tmp = *c;
-+  					*c = *b;
-+  				} 
-+  				//Note: we could increment current once the swap is done in this case, but that seems to impair performance
-+  				else
-+  					tmp = *b;
-+  				*b = *current;
-+  				*current = tmp;
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  	}
-+
-+  	//Standard swapping wrapper for ascending values
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void swap_loop(RandomAccessIter * bins, RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift
-+  		, const std::vector<size_t> &bin_sizes, const unsigned log_divisor, const div_type div_min) 
-+  	{
-+  		nextbinstart += bin_sizes[ii];
-+  		inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, log_divisor, div_min);
-+  	}
-+
-+  	//Functor implementation for recursive sorting
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
-+  	inline void 
-+  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
-+  	{
-+  		RandomAccessIter max, min;
-+  		find_extremes(first, last, max, min, comp);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));
-+  		div_type div_min = shift(*min, log_divisor);
-+  		div_type div_max = shift(*max, log_divisor);
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		bins[0] = first;
-+  		for(unsigned u = 0; u < bin_count - 1; u++)
-+  			bins[u + 1] = bins[u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count - 1; ++u)
-+  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, bin_sizes, log_divisor, div_min);
-+  		bins[bin_count - 1] = last;
-+  		
-+  		//If we've bucketsorted, the array is sorted and we should skip recursion
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u], comp);
-+  			else
-+  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift, comp);
-+  		}
-+  	}
-+
-+  	//Functor implementation for recursive sorting with only Shift overridden
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void 
-+  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift)
-+  	{
-+  		RandomAccessIter max, min;
-+  		find_extremes(first, last, max, min);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));
-+  		div_type div_min = shift(*min, log_divisor);
-+  		div_type div_max = shift(*max, log_divisor);
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		bins[0] = first;
-+  		for(unsigned u = 0; u < bin_count - 1; u++)
-+  			bins[u + 1] = bins[u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned ii = 0; ii < bin_count - 1; ++ii)
-+  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
-+  		bins[bin_count - 1] = last;
-+  		
-+  		//If we've bucketsorted, the array is sorted and we should skip recursion
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			else
-+  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift);
-+  		}
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void 
-+  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		spread_sort_rec<RandomAccessIter, div_type, data_type>(first, last, bin_cache, 0, bin_sizes);
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
-+  	inline void 
-+  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift, compare comp)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(first, last, bin_cache, 0, bin_sizes, shift, comp);
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void 
-+  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift);
-+  	}
-+  }
-+
-+  //Top-level sorting call for integers
-+  template <class RandomAccessIter>
-+  inline void integer_sort(RandomAccessIter first, RandomAccessIter last) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else
-+  		detail::spread_sort(first, last, *first >> 0, *first);
-+  }
-+
-+  //integer_sort with functors
-+  template <class RandomAccessIter, class right_shift, class compare>
-+  inline void integer_sort(RandomAccessIter first, RandomAccessIter last,
-+  						right_shift shift, compare comp) {
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last, comp);
-+  	else
-+  		detail::spread_sort(first, last, shift(*first, 0), *first, shift, comp);
-+  }
-+
-+  //integer_sort with right_shift functor
-+  template <class RandomAccessIter, class right_shift>
-+  inline void integer_sort(RandomAccessIter first, RandomAccessIter last,
-+  						right_shift shift) {
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else
-+  		detail::spread_sort(first, last, shift(*first, 0), *first, shift);
-+  }
-+
-+  //------------------------------------------------------ float_sort source --------------------------------------
-+  //Casts a RandomAccessIter to the specified data type
-+  template<class cast_type, class RandomAccessIter>
-+  inline cast_type
-+  cast_float_iter(const RandomAccessIter & floatiter)
-+  {
-+  	cast_type result;
-+  	std::memcpy(&result, &(*floatiter), sizeof(cast_type));
-+  	return result;
-+  }
-+
-+  //Casts a data element to the specified datinner_float_a type
-+  template<class data_type, class cast_type>
-+  inline cast_type
-+  mem_cast(const data_type & data)
-+  {
-+  	cast_type result;
-+  	std::memcpy(&result, &data, sizeof(cast_type));
-+  	return result;
-+  }
-+
-+  namespace detail {
-+  	template <class RandomAccessIter, class div_type, class right_shift>
-+  	inline void 
-+  	find_extremes(RandomAccessIter current, RandomAccessIter last, div_type & max, div_type & min, right_shift shift)
-+  	{
-+  		min = max = shift(*current, 0);
-+  		while(++current < last) {
-+  			div_type value = shift(*current, 0);
-+  			if(max < value)
-+  				max = value;
-+  			else if(value < min)
-+  				min = value;
-+  		}
-+  	}
-+
-+  	//Specialized swap loops for floating-point casting
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void inner_float_swap_loop(RandomAccessIter * bins, const RandomAccessIter & nextbinstart, unsigned ii
-+  		, const unsigned log_divisor, const div_type div_min) 
-+  	{
-+  		RandomAccessIter * local_bin = bins + ii;
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			for(RandomAccessIter * target_bin = (bins + ((cast_float_iter<div_type, RandomAccessIter>(current) >> log_divisor) - div_min));  target_bin != local_bin; 
-+  				target_bin = bins + ((cast_float_iter<div_type, RandomAccessIter>(current) >> log_divisor) - div_min)) {
-+  				data_type tmp;
-+  				RandomAccessIter b = (*target_bin)++;
-+  				RandomAccessIter * b_bin = bins + ((cast_float_iter<div_type, RandomAccessIter>(b) >> log_divisor) - div_min);
-+  				//Three-way swap; if the item to be swapped doesn't belong in the current bin, swap it to where it belongs
-+  				if (b_bin != local_bin) {
-+  					RandomAccessIter c = (*b_bin)++;
-+  					tmp = *c;
-+  					*c = *b;
-+  				} 
-+  				else
-+  					tmp = *b;
-+  				*b = *current;
-+  				*current = tmp;
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void float_swap_loop(RandomAccessIter * bins, RandomAccessIter & nextbinstart, unsigned ii
-+  		, const std::vector<size_t> &bin_sizes, const unsigned log_divisor, const div_type div_min) 
-+  	{
-+  		nextbinstart += bin_sizes[ii];
-+  		inner_float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, ii, log_divisor, div_min);
-+  	}
-+
-+  	template <class RandomAccessIter, class cast_type>
-+  	inline void 
-+  	find_extremes(RandomAccessIter current, RandomAccessIter last, cast_type & max, cast_type & min)
-+  	{
-+  		min = max = cast_float_iter<cast_type, RandomAccessIter>(current);
-+  		while(++current < last) {
-+  			cast_type value = cast_float_iter<cast_type, RandomAccessIter>(current);
-+  			if(max < value)
-+  				max = value;
-+  			else if(value < min)
-+  				min = value;
-+  		}
-+  	}
-+
-+  	//Special-case sorting of positive floats with casting instead of a right_shift
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void 
-+  	positive_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
-+  		bins[0] = first;
-+  		for(unsigned u = 0; u < bin_count - 1; u++)
-+  			bins[u + 1] = bins[u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count - 1; ++u)
-+  			float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, u, bin_sizes, log_divisor, div_min);
-+  		bins[bin_count - 1] = last;
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			else
-+  				positive_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//Sorting negative_ float_s
-+  	//Note that bins are iterated in reverse order because max_neg_float = min_neg_int
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void 
-+  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
-+  		bins[bin_count - 1] = first;
-+  		for(int ii = bin_count - 2; ii >= 0; --ii)
-+  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//The last bin will always have the correct elements in it
-+  		for(int ii = bin_count - 1; ii > 0; --ii)
-+  			float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, ii, bin_sizes, log_divisor, div_min);
-+  		//Since we don't process the last bin, we need to update its end position
-+  		bin_cache[cache_offset] = last;
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii]);
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//Sorting negative_ float_s
-+  	//Note that bins are iterated in reverse order because max_neg_float = min_neg_int
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void 
-+  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min, shift);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		bins[bin_count - 1] = first;
-+  		for(int ii = bin_count - 2; ii >= 0; --ii)
-+  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//The last bin will always have the correct elements in it
-+  		for(int ii = bin_count - 1; ii > 0; --ii)
-+  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
-+  		//Since we don't process the last bin, we need to update its end position
-+  		bin_cache[cache_offset] = last;
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii]);
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift);
-+  		}
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
-+  	inline void 
-+  	negative_float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min, shift);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		bins[bin_count - 1] = first;
-+  		for(int ii = bin_count - 2; ii >= 0; --ii)
-+  			bins[ii] = bins[ii + 1] + bin_sizes[ii + 1];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//The last bin will always have the correct elements in it
-+  		for(int ii = bin_count - 1; ii > 0; --ii)
-+  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);
-+  		//Since we don't process the last bin, we need to update its end position
-+  		bin_cache[cache_offset] = last;
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Recursing
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_end - 1; ii >= (int)cache_offset; lastPos = bin_cache[ii], --ii) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii], comp);
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift, comp);
-+  		}
-+  	}
-+
-+  	//Casting special-case for floating-point sorting
-+  	template <class RandomAccessIter, class div_type, class data_type>
-+  	inline void 
-+  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[(cast_float_iter<div_type, RandomAccessIter>(current++) >> log_divisor) - div_min]++;
-+  		//The index of the first positive bin
-+  		div_type first_positive = (div_min < 0) ? -div_min : 0;
-+  		//Resetting if all bins are negative
-+  		if(cache_offset + first_positive > cache_end)
-+  			first_positive = cache_end - cache_offset;
-+  		//Reversing the order of the negative bins
-+  		//Note that because of the negative/positive ordering direction flip
-+  		//We can not depend upon bin order and positions matching up
-+  		//so bin_sizes must be reused to contain the end of the bin
-+  		if(first_positive > 0) {
-+  			bins[first_positive - 1] = first;
-+  			for(int ii = first_positive - 2; ii >= 0; --ii) {
-+  				bins[ii] = first + bin_sizes[ii + 1];
-+  				bin_sizes[ii] += bin_sizes[ii + 1];
-+  			}
-+  			//Handling positives following negatives
-+  			if((unsigned)first_positive < bin_count) {
-+  				bins[first_positive] = first + bin_sizes[0];
-+  				bin_sizes[first_positive] += bin_sizes[0];
-+  			}
-+  		}
-+  		else
-+  			bins[0] = first;
-+  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
-+  			bins[u + 1] = first + bin_sizes[u];
-+  			bin_sizes[u + 1] += bin_sizes[u];
-+  		}
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count; ++u) {
-+  			nextbinstart = first + bin_sizes[u];
-+  			inner_float_swap_loop<RandomAccessIter, div_type, data_type>(bins, nextbinstart, u, log_divisor, div_min);
-+  		}
-+  		
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Handling negative values first
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii]);
-+  			//sort negative values using reversed-bin spread_sort
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes);
-+  		}
-+  		
-+  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			//sort positive values using normal spread_sort
-+  			else
-+  				positive_float_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//Functor implementation for recursive sorting
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void 
-+  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min, shift);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		//The index of the first positive bin
-+  		div_type first_positive = (div_min < 0) ? -div_min : 0;
-+  		//Resetting if all bins are negative
-+  		if(cache_offset + first_positive > cache_end)
-+  			first_positive = cache_end - cache_offset;
-+  		//Reversing the order of the negative bins
-+  		//Note that because of the negative/positive ordering direction flip
-+  		//We can not depend upon bin order and positions matching up
-+  		//so bin_sizes must be reused to contain the end of the bin
-+  		if(first_positive > 0) {
-+  			bins[first_positive - 1] = first;
-+  			for(int ii = first_positive - 2; ii >= 0; --ii) {
-+  				bins[ii] = first + bin_sizes[ii + 1];
-+  				bin_sizes[ii] += bin_sizes[ii + 1];
-+  			}
-+  			//Handling positives following negatives
-+  			if((unsigned)first_positive < bin_count) {
-+  				bins[first_positive] = first + bin_sizes[0];
-+  				bin_sizes[first_positive] += bin_sizes[0];
-+  			}
-+  		}
-+  		else
-+  			bins[0] = first;
-+  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
-+  			bins[u + 1] = first + bin_sizes[u];
-+  			bin_sizes[u + 1] += bin_sizes[u];
-+  		}
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count; ++u) {
-+  			nextbinstart = first + bin_sizes[u];
-+  			inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, log_divisor, div_min);
-+  		}
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Handling negative values first
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii]);
-+  			//sort negative values using reversed-bin spread_sort
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift);
-+  		}
-+  		
-+  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			//sort positive values using normal spread_sort
-+  			else
-+  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift);
-+  		}
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
-+  	inline void 
-+  	float_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset
-+  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)
-+  	{
-+  		div_type max, min;
-+  		find_extremes(first, last, max, min, shift);
-+  		if(max == min)
-+  			return;
-+  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(max) - min));
-+  		div_type div_min = min >> log_divisor;
-+  		div_type div_max = max >> log_divisor;
-+  		unsigned bin_count = div_max - div_min + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-+  			
-+  		//Calculating the size of each bin
-+  		for (RandomAccessIter current = first; current != last;)
-+  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;
-+  		//The index of the first positive bin
-+  		div_type first_positive = (div_min < 0) ? -div_min : 0;
-+  		//Resetting if all bins are negative
-+  		if(cache_offset + first_positive > cache_end)
-+  			first_positive = cache_end - cache_offset;
-+  		//Reversing the order of the negative bins
-+  		//Note that because of the negative/positive ordering direction flip
-+  		//We can not depend upon bin order and positions matching up
-+  		//so bin_sizes must be reused to contain the end of the bin
-+  		if(first_positive > 0) {
-+  			bins[first_positive - 1] = first;
-+  			for(int ii = first_positive - 2; ii >= 0; --ii) {
-+  				bins[ii] = first + bin_sizes[ii + 1];
-+  				bin_sizes[ii] += bin_sizes[ii + 1];
-+  			}
-+  			//Handling positives following negatives
-+  			if((unsigned)first_positive < bin_count) {
-+  				bins[first_positive] = first + bin_sizes[0];
-+  				bin_sizes[first_positive] += bin_sizes[0];
-+  			}
-+  		}
-+  		else
-+  			bins[0] = first;
-+  		for(unsigned u = first_positive; u < bin_count - 1; u++) {
-+  			bins[u + 1] = first + bin_sizes[u];
-+  			bin_sizes[u + 1] += bin_sizes[u];
-+  		}
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		for(unsigned u = 0; u < bin_count; ++u) {
-+  			nextbinstart = first + bin_sizes[u];
-+  			inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, log_divisor, div_min);
-+  		}
-+  		
-+  		//Return if we've completed bucketsorting
-+  		if(!log_divisor)
-+  			return;
-+  		
-+  		//Handling negative values first
-+  		size_t max_count = get_max_count(log_divisor, last - first);
-+  		RandomAccessIter lastPos = first;
-+  		for(int ii = cache_offset + first_positive - 1; ii >= (int)cache_offset ; lastPos = bin_cache[ii--]) {
-+  			size_t count = bin_cache[ii] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[ii]);
-+  			//sort negative values using reversed-bin spread_sort
-+  			else
-+  				negative_float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[ii], bin_cache, cache_end, bin_sizes, shift, comp);
-+  		}
-+  		
-+  		for(unsigned u = cache_offset + first_positive; u < cache_end; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			if(count < 2)
-+  				continue;
-+  			if(count < max_count)
-+  				std::sort(lastPos, bin_cache[u]);
-+  			//sort positive values using normal spread_sort
-+  			else
-+  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift, comp);
-+  		}
-+  	}
-+
-+  	template <class RandomAccessIter, class cast_type, class data_type>
-+  	inline void 
-+  	float_Sort(RandomAccessIter first, RandomAccessIter last, cast_type, data_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		float_sort_rec<RandomAccessIter, cast_type, data_type>(first, last, bin_cache, 0, bin_sizes);
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>
-+  	inline void 
-+  	float_Sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift);
-+  	}
-+
-+  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>
-+  	inline void 
-+  	float_Sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift, compare comp)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		float_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift, comp);
-+  	}
-+  }
-+
-+  //float_sort with casting
-+  //The cast_type must be equal in size to the data type, and must be a signed integer
-+  template <class RandomAccessIter, class cast_type>
-+  inline void float_sort_cast(RandomAccessIter first, RandomAccessIter last, cast_type cVal) 
-+  {
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else
-+  		detail::float_Sort(first, last, cVal, *first);
-+  }
-+
-+  //float_sort with casting to an int
-+  //Only use this with IEEE floating-point numbers
-+  template <class RandomAccessIter>
-+  inline void float_sort_cast_to_int(RandomAccessIter first, RandomAccessIter last) 
-+  {
-+  	int cVal = 0;
-+  	float_sort_cast(first, last, cVal);
-+  }
-+
-+  //float_sort with functors
-+  template <class RandomAccessIter, class right_shift>
-+  inline void float_sort(RandomAccessIter first, RandomAccessIter last, right_shift shift) 
-+  {
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else
-+  		detail::float_Sort(first, last, shift(*first, 0), *first, shift);
-+  }
-+
-+  template <class RandomAccessIter, class right_shift, class compare>
-+  inline void float_sort(RandomAccessIter first, RandomAccessIter last, right_shift shift, compare comp) 
-+  {
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last, comp);
-+  	else
-+  		detail::float_Sort(first, last, shift(*first, 0), *first, shift, comp);
-+  }
-+
-+  //------------------------------------------------- string_sort source ---------------------------------------------
-+  namespace detail {
-+  	//Offsetting on identical characters.  This function works a character at a time for optimal worst-case performance.
-+  	template<class RandomAccessIter>
-+  	inline void
-+  	update_offset(RandomAccessIter first, RandomAccessIter finish, unsigned &char_offset)
-+  	{
-+  		unsigned nextOffset = char_offset;
-+  		bool done = false;
-+  		while(!done) {
-+  			RandomAccessIter curr = first;
-+  			do {
-+  				//ignore empties, but if the nextOffset would exceed the length or not match, exit; we've found the last matching character
-+  				if((*curr).size() > char_offset && ((*curr).size() <= (nextOffset + 1) || (*curr)[nextOffset] != (*first)[nextOffset])) {
-+  					done = true;
-+  					break;
-+  				}
-+  			} while(++curr != finish);
-+  			if(!done)
-+  				++nextOffset;
-+  		} 
-+  		char_offset = nextOffset;
-+  	}
-+
-+  	//Offsetting on identical characters.  This function works a character at a time for optimal worst-case performance.
-+  	template<class RandomAccessIter, class get_char, class get_length>
-+  	inline void
-+  	update_offset(RandomAccessIter first, RandomAccessIter finish, unsigned &char_offset, get_char getchar, get_length length)
-+  	{
-+  		unsigned nextOffset = char_offset;
-+  		bool done = false;
-+  		while(!done) {
-+  			RandomAccessIter curr = first;
-+  			do {
-+  				//ignore empties, but if the nextOffset would exceed the length or not match, exit; we've found the last matching character
-+  				if(length(*curr) > char_offset && (length(*curr) <= (nextOffset + 1) || getchar((*curr), nextOffset) != getchar((*first), nextOffset))) {
-+  					done = true;
-+  					break;
-+  				}
-+  			} while(++curr != finish);
-+  			if(!done)
-+  				++nextOffset;
-+  		} 
-+  		char_offset = nextOffset;
-+  	}
-+
-+  	//A comparison functor for strings that assumes they are identical up to char_offset
-+  	template<class data_type, class unsignedchar_type>
-+  	struct offset_lessthan {
-+  		offset_lessthan(unsigned char_offset) : fchar_offset(char_offset){}
-+  		inline bool operator()(const data_type &x, const data_type &y) const 
-+  		{
-+  			unsigned minSize = std::min(x.size(), y.size());
-+  			for(unsigned u = fchar_offset; u < minSize; ++u) {
-+  				if(static_cast<unsignedchar_type>(x[u]) < static_cast<unsignedchar_type>(y[u]))
-+  					return true;
-+  				else if(static_cast<unsignedchar_type>(y[u]) < static_cast<unsignedchar_type>(x[u]))
-+  					return false;
-+  			}
-+  			return x.size() < y.size();
-+  		}
-+  		unsigned fchar_offset;
-+  	};
-+
-+  	//A comparison functor for strings that assumes they are identical up to char_offset
-+  	template<class data_type, class unsignedchar_type>
-+  	struct offset_greaterthan {
-+  		offset_greaterthan(unsigned char_offset) : fchar_offset(char_offset){}
-+  		inline bool operator()(const data_type &x, const data_type &y) const 
-+  		{
-+  			unsigned minSize = std::min(x.size(), y.size());
-+  			for(unsigned u = fchar_offset; u < minSize; ++u) {
-+  				if(static_cast<unsignedchar_type>(x[u]) > static_cast<unsignedchar_type>(y[u]))
-+  					return true;
-+  				else if(static_cast<unsignedchar_type>(y[u]) > static_cast<unsignedchar_type>(x[u]))
-+  					return false;
-+  			}
-+  			return x.size() > y.size();
-+  		}
-+  		unsigned fchar_offset;
-+  	};
-+
-+  	//A comparison functor for strings that assumes they are identical up to char_offset
-+  	template<class data_type, class get_char, class get_length>
-+  	struct offset_char_lessthan {
-+  		offset_char_lessthan(unsigned char_offset) : fchar_offset(char_offset){}
-+  		inline bool operator()(const data_type &x, const data_type &y) const 
-+  		{
-+  			unsigned minSize = std::min(length(x), length(y));
-+  			for(unsigned u = fchar_offset; u < minSize; ++u) {
-+  				if(getchar(x, u) < getchar(y, u))
-+  					return true;
-+  				else if(getchar(y, u) < getchar(x, u))
-+  					return false;
-+  			}
-+  			return length(x) < length(y);
-+  		}
-+  		unsigned fchar_offset;
-+  		get_char getchar;
-+  		get_length length;
-+  	};
-+
-+  	//String sorting recursive implementation
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
-+  		, unsigned cache_offset, std::vector<size_t> &bin_sizes)
-+  	{
-+  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
-+  		//Iterate to the end of the empties.  If all empty, return
-+  		while((*first).size() <= char_offset) {
-+  			if(++first == last)
-+  				return;
-+  		}
-+  		RandomAccessIter finish = last - 1;
-+  		//Getting the last non-empty
-+  		for(;(*finish).size() <= char_offset; --finish) { }
-+  		++finish;
-+  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
-+  		update_offset(first, finish, char_offset);
-+  		
-+  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
-+  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
-+  		const unsigned max_size = bin_count;
-+  		const unsigned membin_count = bin_count + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
-+  			
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last; ++current) {
-+  			if((*current).size() <= char_offset) {
-+  				bin_sizes[0]++;
-+  			}
-+  			else
-+  				bin_sizes[static_cast<unsignedchar_type>((*current)[char_offset]) + 1]++;
-+  		}
-+  		//Assign the bin positions
-+  		bin_cache[cache_offset] = first;
-+  		for(unsigned u = 0; u < membin_count - 1; u++)
-+  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//handling empty bins
-+  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
-+  		nextbinstart +=	bin_sizes[0];
-+  		RandomAccessIter * target_bin;
-+  		//Iterating over each element in the bin of empties
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			//empties belong in this bin
-+  			while((*current).size() > char_offset) {
-+  				target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]);
-+  				iter_swap(current, (*target_bin)++);
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
-+  		unsigned last_bin = bin_count - 1;
-+  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		for(unsigned u = 0; u < last_bin; ++u) {
-+  			local_bin = bins + u;
-+  			nextbinstart += bin_sizes[u + 1];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]);  target_bin != local_bin; 
-+  					target_bin = bins + static_cast<unsignedchar_type>((*current)[char_offset]))
-+  					iter_swap(current, (*target_bin)++);
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[last_bin] = last;
-+  		//Recursing
-+  		RandomAccessIter lastPos = bin_cache[cache_offset];
-+  		//Skip this loop for empties
-+  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_size)
-+  				std::sort(lastPos, bin_cache[u], offset_lessthan<data_type, unsignedchar_type>(char_offset + 1));
-+  			else
-+  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//Sorts strings in reverse order, with empties at the end
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	reverse_string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
-+  		, unsigned cache_offset, std::vector<size_t> &bin_sizes)
-+  	{
-+  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
-+  		RandomAccessIter curr = first;
-+  		//Iterate to the end of the empties.  If all empty, return
-+  		while((*curr).size() <= char_offset) {
-+  			if(++curr == last)
-+  				return;
-+  		}
-+  		//Getting the last non-empty
-+  		while((*(--last)).size() <= char_offset) { }
-+  		++last;
-+  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
-+  		update_offset(curr, last, char_offset);
-+  		RandomAccessIter * target_bin;
-+  		
-+  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
-+  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
-+  		const unsigned max_size = bin_count;
-+  		const unsigned membin_count = bin_count + 1;
-+  		const unsigned max_bin = bin_count - 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count);
-+  		RandomAccessIter * end_bin = &(bin_cache[cache_offset + max_bin]);
-+  			
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last; ++current) {
-+  			if((*current).size() <= char_offset) {
-+  				bin_sizes[bin_count]++;
-+  			}
-+  			else
-+  				bin_sizes[max_bin - static_cast<unsignedchar_type>((*current)[char_offset])]++;
-+  		}
-+  		//Assign the bin positions
-+  		bin_cache[cache_offset] = first;
-+  		for(unsigned u = 0; u < membin_count - 1; u++)
-+  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = last;
-+  		//handling empty bins
-+  		RandomAccessIter * local_bin = &(bin_cache[cache_offset + bin_count]);
-+  		RandomAccessIter lastFull = *local_bin;
-+  		//Iterating over each element in the bin of empties
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			//empties belong in this bin
-+  			while((*current).size() > char_offset) {
-+  				target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]);
-+  				iter_swap(current, (*target_bin)++);
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  		nextbinstart = first;
-+  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
-+  		unsigned last_bin = max_bin;
-+  		for(; last_bin && !bin_sizes[last_bin]; --last_bin) { }
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		for(unsigned u = 0; u < last_bin; ++u) {
-+  			local_bin = bins + u;
-+  			nextbinstart += bin_sizes[u];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]);  target_bin != local_bin; 
-+  					target_bin = end_bin - static_cast<unsignedchar_type>((*current)[char_offset]))
-+  					iter_swap(current, (*target_bin)++);
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[last_bin] = lastFull;
-+  		//Recursing
-+  		RandomAccessIter lastPos = first;
-+  		//Skip this loop for empties
-+  		for(unsigned u = cache_offset; u <= cache_offset + last_bin; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_size)
-+  				std::sort(lastPos, bin_cache[u], offset_greaterthan<data_type, unsignedchar_type>(char_offset + 1));
-+  			else
-+  				reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes);
-+  		}
-+  	}
-+
-+  	//String sorting recursive implementation
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length>
-+  	inline void 
-+  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
-+  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length)
-+  	{
-+  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
-+  		//Iterate to the end of the empties.  If all empty, return
-+  		while(length(*first) <= char_offset) {
-+  			if(++first == last)
-+  				return;
-+  		}
-+  		RandomAccessIter finish = last - 1;
-+  		//Getting the last non-empty
-+  		for(;length(*finish) <= char_offset; --finish) { }
-+  		++finish;
-+  		update_offset(first, finish, char_offset, getchar, length);
-+  		
-+  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
-+  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
-+  		const unsigned max_size = bin_count;
-+  		const unsigned membin_count = bin_count + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
-+  			
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last; ++current) {
-+  			if(length(*current) <= char_offset) {
-+  				bin_sizes[0]++;
-+  			}
-+  			else
-+  				bin_sizes[getchar((*current), char_offset) + 1]++;
-+  		}
-+  		//Assign the bin positions
-+  		bin_cache[cache_offset] = first;
-+  		for(unsigned u = 0; u < membin_count - 1; u++)
-+  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//handling empty bins
-+  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
-+  		nextbinstart +=	bin_sizes[0];
-+  		RandomAccessIter * target_bin;
-+  		//Iterating over each element in the bin of empties
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			//empties belong in this bin
-+  			while(length(*current) > char_offset) {
-+  				target_bin = bins + getchar((*current), char_offset);
-+  				iter_swap(current, (*target_bin)++);
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
-+  		unsigned last_bin = bin_count - 1;
-+  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		for(unsigned ii = 0; ii < last_bin; ++ii) {
-+  			local_bin = bins + ii;
-+  			nextbinstart += bin_sizes[ii + 1];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = bins + getchar((*current), char_offset);  target_bin != local_bin; 
-+  					target_bin = bins + getchar((*current), char_offset))
-+  					iter_swap(current, (*target_bin)++);
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[last_bin] = last;
-+  		
-+  		//Recursing
-+  		RandomAccessIter lastPos = bin_cache[cache_offset];
-+  		//Skip this loop for empties
-+  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_size)
-+  				std::sort(lastPos, bin_cache[u], offset_char_lessthan<data_type, get_char, get_length>(char_offset + 1));
-+  			else
-+  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length>(lastPos, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length);
-+  		}
-+  	}
-+
-+  	//String sorting recursive implementation
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length, class compare>
-+  	inline void 
-+  	string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
-+  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length, compare comp)
-+  	{
-+  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
-+  		//Iterate to the end of the empties.  If all empty, return
-+  		while(length(*first) <= char_offset) {
-+  			if(++first == last)
-+  				return;
-+  		}
-+  		RandomAccessIter finish = last - 1;
-+  		//Getting the last non-empty
-+  		for(;length(*finish) <= char_offset; --finish) { }
-+  		++finish;
-+  		update_offset(first, finish, char_offset, getchar, length);
-+  		
-+  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
-+  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
-+  		const unsigned max_size = bin_count;
-+  		const unsigned membin_count = bin_count + 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count) + 1;
-+  			
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last; ++current) {
-+  			if(length(*current) <= char_offset) {
-+  				bin_sizes[0]++;
-+  			}
-+  			else
-+  				bin_sizes[getchar((*current), char_offset) + 1]++;
-+  		}
-+  		//Assign the bin positions
-+  		bin_cache[cache_offset] = first;
-+  		for(unsigned u = 0; u < membin_count - 1; u++)
-+  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = first;
-+  		//handling empty bins
-+  		RandomAccessIter * local_bin = &(bin_cache[cache_offset]);
-+  		nextbinstart +=	bin_sizes[0];
-+  		RandomAccessIter * target_bin;
-+  		//Iterating over each element in the bin of empties
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			//empties belong in this bin
-+  			while(length(*current) > char_offset) {
-+  				target_bin = bins + getchar((*current), char_offset);
-+  				iter_swap(current, (*target_bin)++);
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
-+  		unsigned last_bin = bin_count - 1;
-+  		for(; last_bin && !bin_sizes[last_bin + 1]; --last_bin) { }
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		for(unsigned u = 0; u < last_bin; ++u) {
-+  			local_bin = bins + u;
-+  			nextbinstart += bin_sizes[u + 1];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = bins + getchar((*current), char_offset);  target_bin != local_bin; 
-+  					target_bin = bins + getchar((*current), char_offset))
-+  					iter_swap(current, (*target_bin)++);
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[last_bin] = last;
-+  		
-+  		//Recursing
-+  		RandomAccessIter lastPos = bin_cache[cache_offset];
-+  		//Skip this loop for empties
-+  		for(unsigned u = cache_offset + 1; u < cache_offset + last_bin + 2; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_size)
-+  				std::sort(lastPos, bin_cache[u], comp);
-+  			else
-+  				string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(lastPos
-+  					, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length, comp);
-+  		}
-+  	}
-+
-+  	//Sorts strings in reverse order, with empties at the end
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type, class get_char, class get_length, class compare>
-+  	inline void 
-+  	reverse_string_sort_rec(RandomAccessIter first, RandomAccessIter last, unsigned char_offset, std::vector<RandomAccessIter> &bin_cache
-+  		, unsigned cache_offset, std::vector<size_t> &bin_sizes, get_char getchar, get_length length, compare comp)
-+  	{
-+  		//This section is not strictly necessary, but makes handling of long identical substrings much faster, with a mild average performance impact.
-+  		RandomAccessIter curr = first;
-+  		//Iterate to the end of the empties.  If all empty, return
-+  		while(length(*curr) <= char_offset) {
-+  			if(++curr == last)
-+  				return;
-+  		}
-+  		//Getting the last non-empty
-+  		while(length(*(--last)) <= char_offset) { }
-+  		++last;
-+  		//Offsetting on identical characters.  This section works a character at a time for optimal worst-case performance.
-+  		update_offset(first, last, char_offset, getchar, length);
-+  		
-+  		const unsigned bin_count = (1 << (sizeof(unsignedchar_type)*8));
-+  		//Equal worst-case between radix and comparison-based is when bin_count = n*log(n).
-+  		const unsigned max_size = bin_count;
-+  		const unsigned membin_count = bin_count + 1;
-+  		const unsigned max_bin = bin_count - 1;
-+  		unsigned cache_end;
-+  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, membin_count);
-+  		RandomAccessIter *end_bin = &(bin_cache[cache_offset + max_bin]);
-+  			
-+  		//Calculating the size of each bin; this takes roughly 10% of runtime
-+  		for (RandomAccessIter current = first; current != last; ++current) {
-+  			if(length(*current) <= char_offset) {
-+  				bin_sizes[bin_count]++;
-+  			}
-+  			else
-+  				bin_sizes[max_bin - getchar((*current), char_offset)]++;
-+  		}
-+  		//Assign the bin positions
-+  		bin_cache[cache_offset] = first;
-+  		for(unsigned u = 0; u < membin_count - 1; u++)
-+  			bin_cache[cache_offset + u + 1] = bin_cache[cache_offset + u] + bin_sizes[u];
-+  		
-+  		//Swap into place
-+  		RandomAccessIter nextbinstart = last;
-+  		//handling empty bins
-+  		RandomAccessIter * local_bin = &(bin_cache[cache_offset + bin_count]);
-+  		RandomAccessIter lastFull = *local_bin;
-+  		RandomAccessIter * target_bin;
-+  		//Iterating over each element in the bin of empties
-+  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  			//empties belong in this bin
-+  			while(length(*current) > char_offset) {
-+  				target_bin = end_bin - getchar((*current), char_offset);
-+  				iter_swap(current, (*target_bin)++);
-+  			}
-+  		}
-+  		*local_bin = nextbinstart;
-+  		nextbinstart = first;
-+  		//iterate backwards to find the last bin with elements in it; this saves iterations in multiple loops
-+  		unsigned last_bin = max_bin;
-+  		for(; last_bin && !bin_sizes[last_bin]; --last_bin) { }
-+  		//This dominates runtime, mostly in the swap and bin lookups
-+  		for(unsigned u = 0; u < last_bin; ++u) {
-+  			local_bin = bins + u;
-+  			nextbinstart += bin_sizes[u];
-+  			//Iterating over each element in this bin
-+  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {
-+  				//Swapping elements in current into place until the correct element has been swapped in
-+  				for(target_bin = end_bin - getchar((*current), char_offset);  target_bin != local_bin; 
-+  					target_bin = end_bin - getchar((*current), char_offset))
-+  					iter_swap(current, (*target_bin)++);
-+  			}
-+  			*local_bin = nextbinstart;
-+  		}
-+  		bins[last_bin] = lastFull;
-+  		//Recursing
-+  		RandomAccessIter lastPos = first;
-+  		//Skip this loop for empties
-+  		for(unsigned u = cache_offset; u <= cache_offset + last_bin; lastPos = bin_cache[u], ++u) {
-+  			size_t count = bin_cache[u] - lastPos;
-+  			//don't sort unless there are at least two items to compare
-+  			if(count < 2)
-+  				continue;
-+  			//using std::sort if its worst-case is better
-+  			if(count < max_size)
-+  				std::sort(lastPos, bin_cache[u], comp);
-+  			else
-+  				reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(lastPos
-+  					, bin_cache[u], char_offset + 1, bin_cache, cache_end, bin_sizes, getchar, length, comp);
-+  		}
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	string_sort(RandomAccessIter first, RandomAccessIter last, data_type, unsignedchar_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(first, last, 0, bin_cache, 0, bin_sizes);
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	reverse_string_sort(RandomAccessIter first, RandomAccessIter last, data_type, unsignedchar_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type>(first, last, 0, bin_cache, 0, bin_sizes);
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class get_char, class get_length, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, data_type, unsignedchar_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length);
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class get_char, class get_length, class compare, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp, data_type, unsignedchar_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length, comp);
-+  	}
-+
-+  	//Holds the bin vector and makes the initial recursive call
-+  	template <class RandomAccessIter, class get_char, class get_length, class compare, class data_type, class unsignedchar_type>
-+  	inline void 
-+  	reverse_string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp, data_type, unsignedchar_type)
-+  	{
-+  		std::vector<size_t> bin_sizes;
-+  		std::vector<RandomAccessIter> bin_cache;
-+  		reverse_string_sort_rec<RandomAccessIter, data_type, unsignedchar_type, get_char, get_length, compare>(first, last, 0, bin_cache, 0, bin_sizes, getchar, length, comp);
-+  	}
-+  }
-+
-+  //Allows character-type overloads
-+  template <class RandomAccessIter, class unsignedchar_type>
-+  inline void string_sort(RandomAccessIter first, RandomAccessIter last, unsignedchar_type unused) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else
-+  		detail::string_sort(first, last, *first, unused);
-+  }
-+
-+  //Top-level sorting call; wraps using default of unsigned char
-+  template <class RandomAccessIter>
-+  inline void string_sort(RandomAccessIter first, RandomAccessIter last) 
-+  {
-+  	unsigned char unused = '\0';
-+  	string_sort(first, last, unused);
-+  }
-+
-+  //Allows character-type overloads
-+  template <class RandomAccessIter, class compare, class unsignedchar_type>
-+  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, compare comp, unsignedchar_type unused) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last, comp);
-+  	else
-+  		detail::reverse_string_sort(first, last, *first, unused);
-+  }
-+
-+  //Top-level sorting call; wraps using default of unsigned char
-+  template <class RandomAccessIter, class compare>
-+  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, compare comp) 
-+  {
-+  	unsigned char unused = '\0';
-+  	reverse_string_sort(first, last, comp, unused);
-+  }
-+
-+  template <class RandomAccessIter, class get_char, class get_length>
-+  inline void string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last);
-+  	else {
-+  		//skipping past empties at the beginning, which allows us to get the character type 
-+  		//.empty() is not used so as not to require a user declaration of it
-+  		while(!length(*first)) {
-+  			if(++first == last)
-+  				return;
-+  		}
-+  		detail::string_sort(first, last, getchar, length, *first, getchar((*first), 0));
-+  	}
-+  }
-+
-+  template <class RandomAccessIter, class get_char, class get_length, class compare>
-+  inline void string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last, comp);
-+  	else {
-+  		//skipping past empties at the beginning, which allows us to get the character type 
-+  		//.empty() is not used so as not to require a user declaration of it
-+  		while(!length(*first)) {
-+  			if(++first == last)
-+  				return;
-+  		}
-+  		detail::string_sort(first, last, getchar, length, comp, *first, getchar((*first), 0));
-+  	}
-+  }
-+
-+  template <class RandomAccessIter, class get_char, class get_length, class compare>
-+  inline void reverse_string_sort(RandomAccessIter first, RandomAccessIter last, get_char getchar, get_length length, compare comp) 
-+  {
-+  	//Don't sort if it's too small to optimize
-+  	if(last - first < detail::MIN_SORT_SIZE)
-+  		std::sort(first, last, comp);
-+  	else {
-+  		//skipping past empties at the beginning, which allows us to get the character type 
-+  		//.empty() is not used so as not to require a user declaration of it
-+  		while(!length(*(--last))) {
-+  			//Note: if there is just one non-empty, and it's at the beginning, then it's already in sorted order
-+  			if(first == last)
-+  				return;
-+  		}
-+  		//making last just after the end of the non-empty part of the array
-+  		++last;
-+  		detail::reverse_string_sort(first, last, getchar, length, comp, *first, getchar((*first), 0));
-+  	}
-+  }
-+}
-+
-+#endif

+ 0 - 15
package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_bsd_addr_c

@@ -1,15 +0,0 @@
---- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_bsd_addr.c	2013-09-11 01:15:20.000000000 +0200
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_bsd_addr.c	2013-10-23 16:28:38.000000000 +0200
-@@ -49,11 +49,10 @@ __FBSDID("$FreeBSD: head/sys/netinet/sct
- #include <netinet/sctp_sysctl.h>
- #include <netinet/sctp_indata.h>
- #if !defined(__Userspace_os_Windows)
-+#include <unistd.h>
- #if defined(ANDROID)
- #include <unistd.h>
- #include <ifaddrs-android-ext.h>
--#else
--#include <sys/unistd.h>
- #endif
- #endif
- 

+ 0 - 22
package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_os_userspace_h

@@ -1,22 +0,0 @@
---- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_os_userspace.h	2013-09-11 01:15:20.000000000 +0200
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h	2013-10-23 16:28:38.000000000 +0200
-@@ -381,9 +381,8 @@ struct udphdr {
- };
- 
- #else /* !defined(Userspace_os_Windows) */
--#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
- #include <sys/socket.h>
--#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
-+#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) || 1
- #include <pthread.h>
- #endif
- typedef pthread_mutex_t userland_mutex_t;
-@@ -406,7 +405,7 @@ struct sx {int dummy;};
- /* #include <sys/param.h>  in FreeBSD defines MSIZE */
- /* #include <sys/ktr.h> */
- /* #include <sys/systm.h> */
--#if defined(__Userspace_os_Windows)
-+#if defined(__Userspace_os_Windows) || 1
- #include <user_queue.h>
- #else
- #include <sys/queue.h>

+ 0 - 25
package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_pcb_c

@@ -1,25 +0,0 @@
---- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_pcb.c	2013-09-11 01:15:20.000000000 +0200
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c	2013-10-23 16:28:38.000000000 +0200
-@@ -30,6 +30,8 @@
-  * THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#define _BSD_SOURCE /* for IPPORT_RESERVED */
-+
- #ifdef __FreeBSD__
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 246687 2013-02-11 21:02:49Z tuexen $");
-@@ -69,11 +71,10 @@ __FBSDID("$FreeBSD: head/sys/netinet/sct
- #endif
- #if defined(__Userspace__)
- #if !defined(__Userspace_os_Windows)
--#if defined(ANDROID)
-+#include <netdb.h>
- #include <unistd.h>
-+#if defined(ANDROID)
- #include <ifaddrs-android-ext.h>
--#else
--#include <sys/unistd.h>
- #endif
- #endif
- #include <user_socketvar.h>

+ 0 - 14
package/firefox/patches/patch-netwerk_sctp_src_user_environment_c

@@ -1,14 +0,0 @@
---- mozilla-release.orig/netwerk/sctp/src/user_environment.c	2013-12-05 17:07:52.000000000 +0100
-+++ mozilla-release/netwerk/sctp/src/user_environment.c	2014-03-16 17:53:08.000000000 +0100
-@@ -35,9 +35,11 @@
- #include <stdint.h>
- #if !defined(__Userspace_os_FreeBSD)
- #if !defined(ANDROID)
-+#if defined(__GLIBC__)
- #include <sys/sysctl.h>
- #endif
- #endif
-+#endif
- #include <netinet/sctp_os_userspace.h>
- #endif
- #include <user_environment.h>

+ 0 - 12
package/firefox/patches/patch-netwerk_sctp_src_user_queue_h

@@ -1,12 +0,0 @@
---- mozilla-release.orig/netwerk/sctp/src/user_queue.h	2013-09-11 01:15:20.000000000 +0200
-+++ mozilla-release/netwerk/sctp/src/user_queue.h	2013-10-23 16:28:38.000000000 +0200
-@@ -31,9 +31,6 @@
- #ifndef _USER_QUEUE_H_
- #define	_USER_QUEUE_H_
- 
--#if !defined (__Userspace_os_Windows)
--#include <sys/cdefs.h>
--#endif
- /*
-  * This file defines four types of data structures: singly-linked lists,
-  * singly-linked tail queues, lists and tail queues.

+ 5 - 5
package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py

@@ -1,11 +1,11 @@
---- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 17:07:53.000000000 +0100
-+++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2014-01-04 17:58:26.000000000 +0100
-@@ -421,7 +421,7 @@ class RecursiveMakeBackend(CommonBackend
+--- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py	2015-01-09 05:38:28.000000000 +0100
++++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2015-01-29 16:46:28.000000000 +0100
+@@ -940,7 +940,7 @@ INSTALL_TARGETS += %(prefix)s
      def _handle_idl_manager(self, manager):
-         build_files = self._purge_manifests['xpidl']
+         build_files = self._install_manifests['xpidl']
  
 -        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
 +        for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
              'xpt/.mkdir.done'):
-             build_files.add(p)
+             build_files.add_optional_exists(p)
  

+ 6 - 6
package/firefox/patches/patch-tools_profiler_platform-linux_cc

@@ -1,6 +1,6 @@
---- mozilla-release.orig/tools/profiler/platform-linux.cc	2013-12-05 17:07:58.000000000 +0100
-+++ mozilla-release/tools/profiler/platform-linux.cc	2014-01-02 14:59:20.000000000 +0100
-@@ -58,7 +58,7 @@
+--- mozilla-release.orig/tools/profiler/platform-linux.cc	2015-01-09 05:38:28.000000000 +0100
++++ mozilla-release/tools/profiler/platform-linux.cc	2015-01-29 16:46:28.000000000 +0100
+@@ -57,7 +57,7 @@
  #include <fcntl.h>      // open
  #include <unistd.h>     // sysconf
  #include <semaphore.h>
@@ -9,7 +9,7 @@
  #include <execinfo.h>   // backtrace, backtrace_symbols
  #endif  // def __GLIBC__
  #include <strings.h>    // index
-@@ -84,14 +84,12 @@
+@@ -92,14 +92,12 @@
  
  #define SIGNAL_SAVE_PROFILE SIGUSR2
  
@@ -23,5 +23,5 @@
  }
 -#endif
  
- #if !defined(ANDROID)
- // Keep track of when any of our threads calls fork(), so we can
+ /* static */ Thread::tid_t
+ Thread::GetCurrentId()

+ 0 - 11
package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc

@@ -1,11 +0,0 @@
---- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc	2013-12-05 17:07:58.000000000 +0100
-+++ mozilla-release/tools/profiler/shared-libraries-linux.cc	2014-01-02 15:00:00.000000000 +0100
-@@ -14,7 +14,7 @@
- #include "platform.h"
- #include "shared-libraries.h"
- 
--#if !defined(__GLIBC__) && ANDROID_VERSION < 18
-+#if 0
- /* a crapy version of getline, because it's not included in old bionics */
- static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
- {

+ 11 - 11
package/firefox/patches/patch-xpcom_ds_nsMathUtils_h

@@ -1,20 +1,20 @@
---- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/ds/nsMathUtils.h	2013-10-23 16:28:38.000000000 +0200
-@@ -98,12 +98,16 @@ inline NS_HIDDEN_(bool) NS_finite(double
+--- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2015-01-09 05:38:29.000000000 +0100
++++ mozilla-release/xpcom/ds/nsMathUtils.h	2015-01-29 21:37:27.000000000 +0100
+@@ -104,12 +104,16 @@ NS_finite(double aNum)
  #ifdef WIN32
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
+   // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+   return !!_finite(aNum);
 -#elif defined(XP_DARWIN)
 +#elif defined(XP_DARWIN) || defined(__UCLIBC__)
-     // Darwin has deprecated |finite| and recommends |isfinite|. The former is
-     // not present in the iOS SDK.
-     return std::isfinite(d);
+   // Darwin has deprecated |finite| and recommends |isfinite|. The former is
+   // not present in the iOS SDK.
+   return std::isfinite(aNum);
  #else
--    return finite(d);
+-  return finite(aNum);
 +#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
++  return std::isfinite(d);
 +#else
-+    return isfinite(d);
++  return isfinite(d);
 +#endif
  #endif
  }

+ 18 - 13
package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp

@@ -1,16 +1,21 @@
---- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-12-05 17:08:00.000000000 +0100
-+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2014-01-02 14:53:47.000000000 +0100
-@@ -1234,8 +1234,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
-        && dq.dqb_bhardlimit)
-     {
-         int64_t QuotaSpaceAvailable = 0;
+--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2015-01-09 05:38:29.000000000 +0100
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2015-01-30 14:13:49.000000000 +0100
+@@ -1407,10 +1407,18 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+ #endif
+       && dq.dqb_bhardlimit) {
+     int64_t QuotaSpaceAvailable = 0;
 +#if defined(__UCLIBC__)
-+	if (dq.dqb_bhardlimit > dq.dqb_curblocks)
-+	    QuotaSpaceAvailable = PRInt64(fs_buf.f_bsize * (dq.dqb_bhardlimit - dq.dqb_curblocks));
++    if (dq.dqb_bhardlimit > dq.dqb_curblocks) {
++      QuotaSpaceAvailable =
++        int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curblocks));
++    }
 +#else
-         if (dq.dqb_bhardlimit > dq.dqb_curspace)
-             QuotaSpaceAvailable = int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace));
+     if (dq.dqb_bhardlimit > dq.dqb_curspace) {
+       QuotaSpaceAvailable =
+         int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace));
+     }
 +#endif
-         if(QuotaSpaceAvailable < *aDiskSpaceAvailable) {
-             *aDiskSpaceAvailable = QuotaSpaceAvailable;
-         }
++
+     if (QuotaSpaceAvailable < *aDiskSpaceAvailable) {
+       *aDiskSpaceAvailable = QuotaSpaceAvailable;
+     }

+ 0 - 17
package/firefox/patches/patch-xpcom_threads_nsThread_cpp

@@ -1,17 +0,0 @@
---- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-12-05 17:08:00.000000000 +0100
-+++ mozilla-release/xpcom/threads/nsThread.cpp	2014-01-02 14:53:47.000000000 +0100
-@@ -23,11 +23,13 @@
-                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
-                       !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
- 
-+#include <features.h>
- #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
-   && defined(_GNU_SOURCE)
--# define MOZ_CANARY
- # include <unistd.h>
-+#if !defined(__UCLIBC__)
- # include <execinfo.h>
-+#endif
- # include <signal.h>
- # include <fcntl.h>
- # include "nsXULAppAPI.h"

+ 6 - 6
package/fontsproto/Makefile

@@ -4,18 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		fontsproto
-PKG_VERSION:=		2.1.2
+PKG_VERSION:=		2.1.3
 PKG_RELEASE:=		1
-PKG_HASH:=		aaf2375a617afdc1500069a838c0694f59f19d592fc9d9ffa05bd4f37b8504c1
+PKG_HASH:=		72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e
 PKG_DESCR:=		fonts extension headers
 PKG_SECTION:=		dev/header
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 PKG_OPTS:=		dev devonly
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 1 - 1
package/libXtst/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP+=		recordproto libXi
 HOST_BUILDDEP:=		recordproto-host xproto-host xextproto-host
 HOST_BUILDDEP+=		inputproto-host kbproto-host xtrans-host
 HOST_BUILDDEP+=		xcb-proto-host libXau-host libpthread-stubs-host
-HOST_BUILDDEP+=		libX11-host libXext-host libXi-host libXtst-host
+HOST_BUILDDEP+=		libX11-host libXext-host libXi-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxtst
 PKG_OPTS:=		dev

+ 3 - 2
package/libstdcxx/Makefile

@@ -19,7 +19,7 @@ endif
 PKG_NAME:=		libstdcxx
 PKG_DESCR:=		c++ support library
 PKG_SECTION:=		libs/misc
-PKG_OPTS:=		nostaging
+PKG_OPTS:=		noremove
 NO_DISTFILES:=		1
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -32,7 +32,8 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
+	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* \
+		${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/nss/Makefile

@@ -4,12 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.16.1
-PKG_RELEASE:=		2
+PKG_VERSION:=		3.17.4
+PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	16
-PKG_PATCH_VERSION:=	1
-PKG_HASH:=		fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e
+PKG_MIN_VERSION:=	17
+PKG_PATCH_VERSION:=	4
+PKG_HASH:=		1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79
 PKG_DESCR:=		network security services library
 PKG_SECTION:=		libs/crypto
 PKG_BUILDDEP:=		nspr zlib sqlite

+ 3 - 3
package/nss/patches/patch-nss_coreconf_Linux_mk

@@ -1,5 +1,5 @@
---- nss-3.16.1.orig/nss/coreconf/Linux.mk	2014-05-02 05:27:18.000000000 +0200
-+++ nss-3.16.1/nss/coreconf/Linux.mk	2014-06-19 14:09:55.000000000 +0200
+--- nss-3.17.4.orig/nss/coreconf/Linux.mk	2015-01-22 20:49:26.000000000 +0100
++++ nss-3.17.4/nss/coreconf/Linux.mk	2015-01-29 15:49:15.000000000 +0100
 @@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1)
  	IMPL_STRATEGY = _PTH
  endif
@@ -13,7 +13,7 @@
  
  DEFAULT_COMPILER = gcc
  
-@@ -146,7 +146,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG)
+@@ -146,7 +146,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,--
  # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
  DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))

+ 3 - 3
package/nss/patches/patch-nss_coreconf_command_mk

@@ -1,6 +1,6 @@
---- nss-3.15.2.orig/nss/coreconf/command.mk	2013-09-25 15:57:55.000000000 +0200
-+++ nss-3.15.2/nss/coreconf/command.mk	2013-09-27 19:07:39.000000000 +0200
-@@ -16,7 +16,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
+--- nss-3.17.4.orig/nss/coreconf/command.mk	2015-01-22 20:49:26.000000000 +0100
++++ nss-3.17.4/nss/coreconf/command.mk	2015-01-29 15:49:15.000000000 +0100
+@@ -15,7 +15,7 @@ LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $
  CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
  		$(XCFLAGS)
  PERL          = perl

+ 6 - 3
package/nss/patches/patch-nss_manifest_mn

@@ -1,8 +1,11 @@
---- nss-3.15.2.orig/nss/manifest.mn	2013-09-25 15:57:55.000000000 +0200
-+++ nss-3.15.2/nss/manifest.mn	2013-09-30 16:02:15.000000000 +0200
-@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
+--- nss-3.17.4.orig/nss/manifest.mn	2015-01-22 20:49:26.000000000 +0100
++++ nss-3.17.4/nss/manifest.mn	2015-01-29 15:57:46.000000000 +0100
+@@ -10,7 +10,7 @@ IMPORTS =	nspr20/v4.8 \
  
  RELEASE = nss
  
 -DIRS = coreconf lib cmd
 +DIRS = coreconf lib cmd config
+ 
+ ifdef NSS_BUILD_GTESTS
+ DIRS += external_tests

+ 2 - 2
package/openssl/Makefile

@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
 PKG_VERSION:=		1.0.1j
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3
 PKG_DESCR:=		secure socket layer libraries
 PKG_SECTION:=		libs/crypto
@@ -64,7 +64,7 @@ CONFIG:=		linux-embedded
 endif
 
 host-configure:
-	(cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr')
+	(cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC)
 
 host-build:
 	(cd $(WRKBUILD); make)

+ 1 - 3
package/php/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		php
 PKG_VERSION:=		5.6.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		fad244506cc7f10fe56aba8129b3c39a4f9316d9544a4fba932c3f81fc2244b5
 PKG_DESCR:=		php language interpreter
 PKG_SECTION:=		dev/lang
@@ -70,8 +70,6 @@ PKGFD_MOD_ZLIB:=	zlib support
 PKGFB_MOD_ZLIB:=	zlib
 PKGFS_MOD_ZLIB:=	zlib
 
-PKG_HOST_DEPENDS:=	!cygwin
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 6 - 480
package/php/files/php.ini

@@ -1,552 +1,78 @@
 [PHP]
-
-cgi.fix_pathinfo=1
-
+cgi.fix_pathinfo = 0
 zend.ze1_compatibility_mode = Off
-
-;short_open_tag = Off
 asp_tags = Off
-precision    =  12
+precision = 12
 y2k_compliance = On
 output_buffering = Off
-
 zlib.output_compression = Off
-;zlib.output_handler =
 implicit_flush = Off
-
 unserialize_callback_func=
 serialize_precision = 100
-
 safe_mode = Off
-
 safe_mode_gid = Off
-
 safe_mode_include_dir =
-
 safe_mode_exec_dir =
-
 safe_mode_allowed_env_vars = PHP_
-
 safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-;open_basedir =
-
 disable_functions =
-
 disable_classes =
-
-; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; <span style="color: ???????"> would work.
-;highlight.string  = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html    = #000000
-
 expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-memory_limit = 32M      ; Maximum amount of memory a script may consume (8MB)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field.  Or each number up to get desired error
-; reporting level
-; E_ALL             - All errors and warnings (doesn't include E_STRICT)
-; E_ERROR           - fatal run-time errors
-; E_WARNING         - run-time warnings (non-fatal errors)
-; E_PARSE           - compile-time parse errors
-; E_NOTICE          - run-time notices (these are warnings which often result
-;                     from a bug in your code, but it's possible that it was
-;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it's automatically initialized to an
-;                     empty string)
-; E_STRICT			- run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
-; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-;                     initial startup
-; E_COMPILE_ERROR   - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR      - user-generated error message
-; E_USER_WARNING    - user-generated warning message
-; E_USER_NOTICE     - user-generated notice message
-;
-; Examples:
-;
-;   - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
-;
-;   - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-;   - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
-;
-;   - Show all errors except for notices and coding standards warnings
-;
+memory_limit = 64M      ; Maximum amount of memory a script may consume (8MB)
 error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
-
-; Print out errors (as a part of the output).  For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below).  Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
 display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed.  It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
 display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
 log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
 log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
 ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; sourcelines.
 ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
 report_memleaks = On
-
-; Store the last error/warning message in $php_errormsg (boolean).
 track_errors = Off
-
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
-;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot.
-; Note: Never use this feature for production boxes.
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-
-; String to output before an error message.
-;error_prepend_string = "<font color=ff0000>"
-
-; String to output after an error message.
-;error_append_string = "</font>"
-
-; Log errors to specified file.
-;error_log = filename
-
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&amp;"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC).  Registration is done from left to right, newer
-; values override older values.
+error_log = /var/log/php.log
 variables_order = "EGPCS"
-
-; Whether or not to register the EGPCS variables as global variables.  You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data.  This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on;  Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
 register_globals = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information).  If you don't use these variables, you
-; should turn it off for increased performance.
 register_argc_argv = On
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 8M
-
-; Magic quotes
-;
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
+post_max_size = 64M
 magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
 magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
 auto_prepend_file =
 auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
 default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues.  The alternate is to use the
-; cgi.force_redirect configuration below
-; lighttpd: must be the same as server.document-root
-;doc_root = /srv/www/htdocs
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
 user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
 extension_dir = "/usr/lib/php"
-
-; Whether or not to enable the dl() function.  The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
 enable_dl = On
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers.  Left undefined, PHP turns this on by default.  You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution.  Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-; security tokens of the calling client.  This allows IIS to define the
-; security context that the request runs under.  mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS.  Default is zero.
-; fastcgi.impersonate = 1;
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-;cgi.rfc2616_headers = 0
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
 file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
 upload_tmp_dir = /tmp
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 2M
-
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+upload_max_filesize = 64M
 allow_url_fopen = On
-
-; Define the anonymous ftp password (your email address)
-;from="john@doe.com"
-
-; Define the User-Agent string
-; user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
 default_socket_timeout = 60
 
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename.extension
-;
-; For example, on Windows:
-;
-;   extension=msql.dll
-;
-; ... or under UNIX:
-;
-;   extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here.  Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=ftp.so
-;extension=gd.so
-;extension=mysql.so
-;extension=pcre.so
-;extension=session.so
-;extension=sockets.so
-;extension=xml.so
-
-
-
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
 [SQL]
 sql.safe_mode = Off
 
 [Session]
-; Handler used to store/retrieve data.
 session.save_handler = files
-
-; Argument passed to save_handler.  In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; As of PHP 4.0.1, you can define the path as:
-;
-;     session.save_path = "N;/path"
-;
-; where N is an integer.  Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories.  This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-;         You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-;         use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-;     session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
 session.save_path = "/tmp"
-
-; Whether to use cookies.
 session.use_cookies = 1
-
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
 session.name = PHPSESSID
-
-; Initialize session on request startup.
 session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
 session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
 session.cookie_path = /
-
-; The domain for which the cookie is valid.
 session.cookie_domain =
-
-; Handler used to serialize data.  php is the standard serializer of PHP.
 session.serialize_handler = php
-
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
 session.gc_probability = 1
 session.gc_divisor     = 100
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
 session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-;       (see session.save_path above), then garbage collection does *not*
-;       happen automatically.  You will need to do your own garbage
-;       collection through a shell script, cron entry, or some other method.
-;       For example, the following script would is the equivalent of
-;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
 session.bug_compat_42 = 1
 session.bug_compat_warn = 1
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
 session.referer_check =
-
-; How many bytes to read from the file.
 session.entropy_length = 0
-
-; Specified here to create the session id.
 session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
 session.cache_limiter = nocache
-
-; Document expires after n minutes.
 session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-;   to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-;   in publically accessible computer.
-; - User may access your site with the same session ID
-;   always using URL stored in browser's history or bookmarks.
 session.use_trans_sid = 0
-
-; Select a hash function
-; 0: MD5   (128 bits)
-; 1: SHA-1 (160 bits)
 session.hash_function = 0
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
 session.hash_bits_per_character = 4
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; form/fieldset are special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs.  If you want XHTML conformity, remove the form entry.
-; Note that all valid entries require a "=", even if no value follows.
 url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset="
-
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting().  Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-
-
-
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel    = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel    = JIS
-

+ 10 - 2
package/php/files/php.init

@@ -13,10 +13,18 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	/usr/bin/php ${php_flags} &
+	if [ -x /usr/bin/php-cgi ];then
+		su -m www -c "/usr/bin/php-cgi -b /var/run/php5.sock"
+	else
+		/usr/bin/php-fpm -D
+	fi
 	;;
 stop)
-	for i in $(pgrep -f /usr/bin/php);do kill -9 $i;done
+	if [ -x /usr/bin/php-cgi ];then
+		pkill php-cgi
+	else
+		pkill php-fpm
+	fi
 	;;
 restart)
 	sh $0 stop

+ 3 - 3
package/python2/Makefile

@@ -5,12 +5,12 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		12
+PKG_RELEASE:=		13
 PKG_HASH:=		8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf
 PKG_DESCR:=		python scripting language (Version 2)
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		libffi python2-host 
-HOST_BUILDDEP:=		libffi-host bzip2-host
+HOST_BUILDDEP:=		libffi-host bzip2-host openssl-host
 PKG_DEPENDS:=		libpthread libffi
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
@@ -100,8 +100,8 @@ CONFIGURE_ARGS:=	--with-threads \
 
 HOST_CONFIGURE_ENV+=	MACOSX_DEPLOYMENT_TARGET=10.9
 HOST_CONFIGURE_ARGS+=	--with-threads \
+			--enable-shared \
 			--disable-ipv6 \
-			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
 

+ 4 - 4
package/sqlite/Makefile

@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.8.5
+PKG_VERSION:=		3.8.8.1
 PKG_RELEASE:=		1
 PKG_HASH:=		98c33abe4106e508e73fda648b2657ac9e969fe24695f543dcde68cc71f3091b
 PKG_DESCR:=		embeddable sql database cli
@@ -12,12 +12,12 @@ PKG_SECTION:=		sys/misc
 PKG_BUILDDEP:=		ncurses readline
 PKG_DEPENDS:=		libsqlite
 PKG_URL:=		http://www.sqlite.org/
-PKG_SITES:=		http://www.sqlite.org/2014/
+PKG_SITES:=		http://www.sqlite.org/2015/
 PKG_LIBNAME:=		libsqlite
 PKG_OPTS:=		dev
 
-DISTFILES:=		sqlite-autoconf-3080500.tar.gz
-WRKDIST=		${WRKDIR}/sqlite-autoconf-3080500
+DISTFILES:=		sqlite-autoconf-3080801.tar.gz
+WRKDIST=		${WRKDIR}/sqlite-autoconf-3080801
 
 PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE
 PKGSD_LIBSQLITE:=	emeddable sql library

+ 7 - 8
package/xf86-input-keyboard/Makefile

@@ -11,20 +11,19 @@ PKG_DESCR:=		x11 driver for keyboard
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libstdcxx
 PKG_BUILDDEP:=		xorg-server
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,xf86-input-keyboard,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,xf86-input-keyboard,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 xf86-input-keyboard-install:
-	${INSTALL_DIR} ${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input
-	${CP} ${WRKINST}/usr/lib/xorg/modules/input/kbd_drv.so \
-		${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input/
+	$(INSTALL_DIR) $(IDIR_XF86_INPUT_KEYBOARD)/usr/lib/xorg/modules/input
+	$(CP) $(WRKINST)/usr/lib/xorg/modules/input/kbd_drv.so \
+		$(IDIR_XF86_INPUT_KEYBOARD)/usr/lib/xorg/modules/input/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 9 - 10
package/xf86-input-mouse/Makefile

@@ -4,27 +4,26 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-mouse
-PKG_VERSION:=		1.9.0
+PKG_VERSION:=		1.9.1
 PKG_RELEASE:=		1
-PKG_HASH:=		aae699ff0cec4ad2e4e420f49d04e103f4af278c36fc1bbdc3eb388ad5fd50ee
+PKG_HASH:=		e348aff7068affbc53620cc6ee67821064b32ace681c7c200c6ad3e74719b8da
 PKG_DESCR:=		x11 driver for mouse
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libstdcxx
 PKG_BUILDDEP:=		xorg-server
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XF86_INPUT_MOUSE,xf86-input-mouse,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_MOUSE,xf86-input-mouse,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 xf86-input-mouse-install:
-	${INSTALL_DIR} ${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input
-	${CP} ${WRKINST}/usr/lib/xorg/modules/input/mouse_drv.so \
-		${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input/
+	$(INSTALL_DIR) $(IDIR_XF86_INPUT_MOUSE)/usr/lib/xorg/modules/input
+	$(CP) $(WRKINST)/usr/lib/xorg/modules/input/mouse_drv.so \
+		$(IDIR_XF86_INPUT_MOUSE)/usr/lib/xorg/modules/input/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 9 - 9
package/xf86-video-intel/Makefile

@@ -9,20 +9,20 @@ PKG_RELEASE:=		1
 PKG_HASH:=		1888f2733f8dccf4ab24bc56ba62eeac41c231b98365027438702d6c55216576
 PKG_DESCR:=		x11 driver for intel vga chips
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server libdrm mesalib libstdcxx
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesalib
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_DEPENDS:=		xorg-server libdrm mesalib libstdcxx libudev
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesalib eudev
+PKG_SITES:=		$(MASTER_SITE_XORG)
 
 PKG_SYSTEM_DEPENDS:=	ibm-x40
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 xf86-video-intel-install:
-	${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers
-	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
-		${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers/
+	$(INSTALL_DIR) $(IDIR_XF86_VIDEO_INTEL)/usr/lib/xorg/modules/drivers
+	$(CP) $(WRKINST)/usr/lib/xorg/modules/drivers/*.so \
+		$(IDIR_XF86_VIDEO_INTEL)/usr/lib/xorg/modules/drivers/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 6 - 7
package/xorg-server/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.15.1
+PKG_VERSION:=		1.16.3
 PKG_RELEASE:=		1
-PKG_HASH:=		0c144e98081887c93c066c0bd5725865b014ed1acd6def1319a1e350ced96d76
+PKG_HASH:=		293d6a73a560f9f7f5cc8a05d84445a3aabfdf43683925d0f93c8f8502536c84
 PKG_DESCR:=		xorg server
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile
@@ -26,19 +26,18 @@ PKG_OPTS:=		dev
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC
-PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
-PKGFD_WITH_DRI:=		enable DRI support
+PKGFD_WITH_DRI:=		enable dri support
 PKGFB_WITH_DRI:=		xf86driproto glproto mesalib
-PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
+PKGFD_WITH_KDRIVE:=		build kdrive xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO
-PKGCD_WITH_GCRYPT:=		use libgcrypt for SHA1
+PKGCD_WITH_GCRYPT:=		use libgcrypt for sha1
 PKGCS_WITH_GCRYPT:=		libgcrypt
 PKGCB_WITH_GCRYPT:=		libgcrypt
-PKGCD_WITH_CRYPTO:=		use openssl libcrypto for SHA1
+PKGCD_WITH_CRYPTO:=		use openssl libcrypto for sha1
 PKGCS_WITH_CRYPTO:=		libopenssl
 PKGCB_WITH_CRYPTO:=		openssl
 

+ 0 - 13
package/xorg-server/patches/patch-hw_kdrive_linux_linux_c

@@ -1,13 +0,0 @@
---- xorg-server-1.15.0.orig/hw/kdrive/linux/linux.c	2013-12-27 18:38:52.000000000 +0100
-+++ xorg-server-1.15.0/hw/kdrive/linux/linux.c	2014-03-21 12:51:06.774068258 +0100
-@@ -66,8 +66,8 @@ static void
- LinuxCheckChown(const char *file)
- {
-     struct stat st;
--    __uid_t u;
--    __gid_t g;
-+    uid_t u;
-+    gid_t g;
- 
-     if (stat(file, &st) < 0)
-         return;

+ 0 - 13
package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c

@@ -1,13 +0,0 @@
---- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_init.c	2013-12-27 18:38:52.000000000 +0100
-+++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_init.c	2014-03-21 12:56:02.898707432 +0100
-@@ -83,8 +83,8 @@ xf86OpenConsole(void)
-     struct vt_mode VT;
-     struct vt_stat vts;
-     MessageType from = X_PROBED;
--    char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
--    char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
-+    char *tty0[] = { "/dev/tty0", NULL };
-+    char *vcs[] = { "/dev/tty%d", NULL };
- 
-     if (serverGeneration == 1) {
- 

+ 8 - 8
package/xproto/Makefile

@@ -4,24 +4,24 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xproto
-PKG_VERSION:=		7.0.23
+PKG_VERSION:=		7.0.27
 PKG_RELEASE:=		1
 PKG_DESCR:=		x window system core protocol headers
 PKG_SECTION:=		dev/header
-PKG_HASH:=		07efb40fdd23943ec554920eaf1fe175f70d20127c7a0ee8ab818bd88226f696
+PKG_HASH:=		693d6ae50cb642fc4de6ab1f69e3f38a8e5a67eb41ac2aca253240f999282b6b
 PKG_BUILDDEP:=		xproto-host
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 PKG_OPTS:=		dev devonly
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 HOST_STYLE:=		auto
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 1 - 0
rules.mk

@@ -48,6 +48,7 @@ ADK_QEMU_ARGS:=				$(strip $(subst ",, $(ADK_QEMU_ARGS)))
 ADK_RUNTIME_TMPFS_SIZE:=		$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_RUNTIME_CONSOLE_SERIAL_DEVICE:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)))
+ADK_RUNTIME_CONSOLE_VGA_DEVICE:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_VGA_DEVICE)))
 ADK_HOST:=				$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=				$(strip $(subst ",, $(ADK_VENDOR)))
 ADK_DL_DIR:=				$(strip $(subst ",, $(ADK_DL_DIR)))

+ 8 - 0
target/Makefile

@@ -36,6 +36,14 @@ config-prepare: $(ADK_TOPDIR)/.config
 		echo "no miniconfig found for target system"; \
 		exit 1; \
 	fi
+ifneq ($(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),)
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \
+		$(BUILD_DIR)/.kernelconfig.board
+endif
+ifneq ($(ADK_RUNTIME_CONSOLE_VGA_DEVICE),)
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
+		$(BUILD_DIR)/.kernelconfig.board
+endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y)
 	@$(SED) 's#^\(CONFIG_.*BOOTPARAM_STRING="\)\(.*\)"#\1\2 ro $(FS_CMDLINE)"#' \
 		$(BUILD_DIR)/.kernelconfig.board

+ 1 - 0
target/aarch64/systems/arm-fm

@@ -9,5 +9,6 @@ config ADK_TARGET_SYSTEM_ARM_FM
 	select ADK_LINUX_64
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
+	select ADK_TARGET_WITH_SERIAL
 	help
 	 Support for ARMv8 Foundation Model (aarch64).

+ 1 - 0
target/arm/systems/linksys-nslu2

@@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	select ADK_eabihf
 	select ADK_linksys_nslu2
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	  Linksys NSLU2

+ 1 - 0
target/arm/systems/raspberry-pi

@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_CPU_ARM1176JZF_S
 	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT

+ 1 - 0
target/arm/systems/sharp-zaurus

@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_CPU_XSCALE
 	select ADK_TARGET_CPU_WITH_IWMMXT
 	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCMCIA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_SOUND

+ 1 - 0
target/arm/systems/solidrun-imx6

@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_CPU_CORTEX_A9
 	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_SD

+ 2 - 1
target/avr32/systems/atmel-ngw100

@@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	select ADK_CPU_AVR32
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_HOST_BUILD_U_BOOT
+	select ADK_TARGET_WITH_SERIAL
 	help
-	  ATMEL NGW100
+	  Atmel NGW100
 

+ 1 - 0
target/config/Config.in

@@ -21,6 +21,7 @@ config ADK_TARGET_UCLINUX
 
 config ADK_TARGET_QEMU
 	bool
+	select ADK_TARGET_WITH_SERIAL
 
 config ADK_TARGET_VBOX
 	bool

+ 13 - 22
target/config/Config.in.adk

@@ -63,60 +63,51 @@ config ADK_MAKE_JOBS
 	default 1 if ! ADK_MAKE_PARALLEL
 
 config ADK_MAKE_PARALLEL
-	prompt "Enable parallel building of packages"
-	boolean
+	bool "Enable parallel building of packages"
 	default y
 
 config ADK_MAKE_JOBS
-	prompt "How many jobs to use"
-	int
+	int "How many jobs to use"
 	default 4
 	depends on ADK_MAKE_PARALLEL
 	help
 	  The number specified here will be passed to make as N in '-jN'
 
 config ADK_TARGET_IP
-	prompt "Set target ip address for make check"
-	string
+	string "Set target ip address for make check"
 	default "127.0.0.1"
 	help
+	  IP address of target, when running make check.
 
 config ADK_TARGET_PORT
-	prompt "Set target port for make check"
-	string
+	string "Set target port for make check"
 	default "2222" if ADK_TARGET_QEMU
 	default "22"
 	help
+	  Port to use for SSH when running make check.
 
 choice 
 prompt "Hostsystem (do not change!)"
 config ADK_HOST_LINUX
-	prompt "Linux"
-	boolean
+	bool "Linux"
 
 config ADK_HOST_FREEBSD
-	prompt "FreeBSD"
-	boolean
+	bool "FreeBSD"
 
 config ADK_HOST_MIRBSD
-	prompt "MirBSD"
-	boolean
+	bool "MirBSD"
 
 config ADK_HOST_OPENBSD
-	prompt "OpenBSD"
-	boolean
+	bool "OpenBSD"
 
 config ADK_HOST_NETBSD
-	prompt "NetBSD"
-	boolean
+	bool "NetBSD"
 
 config ADK_HOST_DARWIN
-	prompt "Darwin"
-	boolean
+	bool "Darwin"
 
 config ADK_HOST_CYGWIN
-	prompt "Cygwin"
-	boolean
+	bool "Cygwin"
 
 endchoice
 endmenu

+ 2 - 10
target/config/Config.in.binfmt

@@ -7,27 +7,19 @@ depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN |
 
 config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARM
+	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && !ADK_TARGET_UCLINUX
 
 config ADK_TARGET_BINFMT_DSBT
 	bool "DSBT"
 	depends on ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_M68K
-	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FDPIC
 	bool "FDPIC"
 	depends on ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
+	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && ADK_TARGET_UCLINUX
 
 endchoice
 

+ 34 - 31
target/config/Config.in.hardware

@@ -3,94 +3,97 @@
 
 # hardware features, do not use for qemu
 config ADK_TARGET_WITH_CPU_FREQ
-	boolean
+	bool
 
 config ADK_TARGET_WITH_USB
-	boolean
+	bool
 
 config ADK_TARGET_WITH_I2C
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SPI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_PCI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SSB
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SDIO
-	boolean
+	bool
 
 config ADK_TARGET_WITH_AHB
-	boolean
+	bool
 
 config ADK_TARGET_WITH_MINIPCI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_ACPI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_VGA
-	boolean
+	bool
+
+config ADK_TARGET_WITH_SERIAL
+	bool
 
 config ADK_TARGET_WITH_NAND
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SD
-	boolean
+	bool
 
 config ADK_TARGET_WITH_MTD
-	boolean
+	bool
 
 config ADK_TARGET_WITH_GEODE_CRYPTO
-	boolean
+	bool
 
 config ADK_TARGET_WITH_PATA
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SATA
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SCSI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_INPUT
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SOUND
-	boolean
+	bool
 
 config ADK_TARGET_WITH_TOUCHSCREEN
-	boolean
+	bool
 
 config ADK_TARGET_WITH_LEDS
-	boolean
+	bool
 
 config ADK_TARGET_WITH_PP
-	boolean
+	bool
 
 config ADK_TARGET_WITH_CARDBUS
-	boolean
+	bool
 
 config ADK_TARGET_WITH_PCMCIA
-	boolean
+	bool
 
 config ADK_TARGET_WITH_RTC
-	boolean
+	bool
 
 config ADK_TARGET_WITH_WATCHDOG
-	boolean
+	bool
 
 config ADK_TARGET_WITH_WIFI
-	boolean
+	bool
 
 config ADK_TARGET_WITH_DSL
-	boolean
+	bool
 
 config ADK_TARGET_WITH_USB_BOOT
-	boolean
+	bool
 
 config ADK_TARGET_WITH_SMP
-	boolean
+	bool

+ 14 - 12
target/config/Config.in.qemuopts

@@ -11,18 +11,19 @@ config ADK_QEMU_ARGS
 	default "-nographic"
 
 config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-	boolean
+	bool
+	select ADK_TARGET_WITH_VGA
 	depends on ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 
 choice 
-prompt "Use a Bootloader"
+prompt "Bootloader"
 depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
 
 config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER
-	boolean "do not use bootloader"
+	bool "do not use bootloader"
 
 config ADK_TARGET_QEMU_WITH_BOOTLOADER
-	boolean "use bootloader"
+	bool "use bootloader"
 	select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
 
 endchoice
@@ -35,10 +36,10 @@ default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS
 default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2
 
 config ADK_TARGET_QEMU_WITHOUT_BLOCK
-	boolean "disabled"
+	bool "disabled"
 
 config ADK_TARGET_QEMU_WITH_BLOCK
-	boolean "enabled"
+	bool "enabled"
 	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS || ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
@@ -56,10 +57,11 @@ prompt "Qemu Emulation with graphical output"
 depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH
 
 config ADK_TARGET_QEMU_WITHOUT_GRAPHIC
-	boolean "disabled"
+	bool "disabled"
 
 config ADK_TARGET_QEMU_WITH_GRAPHIC
-	boolean "enabled"
+	bool "enabled"
+	select ADK_TARGET_WITH_VGA
 	select ADK_KERNEL_VT
 	select ADK_KERNEL_VT_CONSOLE
 	select ADK_KERNEL_FONTS
@@ -88,10 +90,10 @@ depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
 default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64
 
 config ADK_TARGET_QEMU_WITHOUT_VIRTIO
-	boolean "disabled"
+	bool "disabled"
 
 config ADK_TARGET_QEMU_WITH_VIRTIO
-	boolean "enabled"
+	bool "enabled"
 	select ADK_KERNEL_VIRTIO
 	select ADK_KERNEL_VIRTIO_PCI
 	select ADK_KERNEL_VIRTIO_NET
@@ -105,10 +107,10 @@ prompt "Qemu Emulation with audio support"
 depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
 
 config ADK_TARGET_QEMU_WITHOUT_AUDIO
-	boolean "disabled"
+	bool "disabled"
 
 config ADK_TARGET_QEMU_WITH_AUDIO
-	boolean "enabled"
+	bool "enabled"
 
 endchoice
 endmenu

+ 68 - 63
target/config/Config.in.runtime

@@ -9,23 +9,25 @@ config ADK_RUNTIME_HOSTNAME
 
 config ADK_RUNTIME_SSH_PUBKEY
 	string "SSH public key (root user only)"
-	default ""
 	depends on ADK_PACKAGE_OPENSSH_SERVER || ADK_PACKAGE_DROPBEAR
+	default ""
 	help
 	  Paste your generated SSH public key here and it will be embedded into
 	  the built image, so you can use it to login instantly.
 
 config ADK_RUNTIME_PASSWORD
 	string "root password for the embedded system"
-	default "linux123"
+	default "$1$bJoW4DmS$7fUVat.9iFSAePzA4j4Jm."
 	help
 	  Predefine the root password enabled in the built image.
+	  Use ./host_x86_64-linux-gnu/usr/bin/mkcrypt to generate the hash.
+	  Default password is linux123.
 
 config ADK_RUNTIME_START_SERVICES
-	prompt "start services by default"
-	boolean
+	bool "start services by default"
 	default n
 	help
+	  Enable this option to start selected services on boot.
 
 source "target/config/Config.in.scripts"
 
@@ -49,56 +51,52 @@ config ADK_RUNTIME_TIMEZONE
 	  Predefine the timezone for the embedded system.
 
 config ADK_QUIET_KERNEL
-	prompt "make bootup quiet without messages from the kernel"
-	boolean
-	default n
+	bool "make bootup quiet without messages from the kernel"
 	help
 	  Make bootup quiet without messages from the kernel.
 
 choice
 prompt "bootup messages from initscripts"
-default ADK_RUNTIME_QUIET_INIT if ADK_PKG_KODIBOX
-default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX
+default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
 config ADK_RUNTIME_VERBOSE_INIT_VGA
-	depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX
-	boolean "output via VGA"
+	bool "output via VGA"
+	depends on ADK_TARGET_WITH_VGA
 
 config ADK_RUNTIME_VERBOSE_INIT_SERIAL
-	boolean "output via serial"
+	bool "output via serial"
+	depends on ADK_TARGET_WITH_SERIAL
 
 config ADK_RUNTIME_QUIET_INIT
-	boolean "no output"
+	bool "no output"
 
 endchoice
 
 choice
 prompt "start getty or shell after bootup"
-default ADK_RUNTIME_SHELL if ADK_PKG_TEST
-default ADK_RUNTIME_NONE if ADK_PKG_KODIBOX
 default ADK_RUNTIME_GETTY
 
 config ADK_RUNTIME_GETTY
-	boolean "start a getty after bootup"
+	bool "start a getty after bootup"
 	help
 	  Start a getty after bootup.
 
 config ADK_RUNTIME_SHELL
-	boolean "start a shell after bootup"
+	bool "start a shell after bootup"
 	help
-	  Start a shell after bootup
+	  Start a shell after bootup.
 
 config ADK_RUNTIME_NONE
-	boolean "start no shell nor getty after bootup"
+	bool "start no shell nor getty after bootup"
 	help
-	  Do not start a shell or getty after bootup
+	  Do not start a shell or getty after bootup.
 
 endchoice
 
 config ADK_RUNTIME_GETTY_VGA
-	boolean "start getty on VGA console (tty1-tty6)"
-	depends on ADK_RUNTIME_GETTY
+	bool "start getty on VGA console (tty1-tty6)"
+	depends on ADK_RUNTIME_GETTY && ADK_TARGET_WITH_VGA
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -112,8 +110,8 @@ config ADK_RUNTIME_GETTY_VGA
           Start getty on VGA console. (tty1-tty6)
 
 config ADK_RUNTIME_GETTY_SERIAL
-	boolean "start getty on serial console"
-	depends on ADK_RUNTIME_GETTY
+	bool "start getty on serial console"
+	depends on ADK_RUNTIME_GETTY && ADK_TARGET_WITH_SERIAL
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -126,9 +124,15 @@ config ADK_RUNTIME_GETTY_SERIAL
 	help
 	  Start getty on serial console.
 
+config ADK_RUNTIME_CONSOLE_VGA_DEVICE
+	string "VGA console device"
+	depends on ADK_TARGET_WITH_VGA
+	default "tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default "tty0"
+
 config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
-	prompt "serial console device"
-	string
+	string "serial console device"
+	depends on ADK_TARGET_WITH_SERIAL
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64
@@ -138,16 +142,16 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
-	prompt "serial console speed"
-	string
+	string "serial console speed"
+	depends on ADK_TARGET_WITH_SERIAL
 	default "9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP	
 	default "115200"
 
 config ADK_RUNTIME_KBD_LAYOUT
 	string "keyboard layout for the embedded system"
-	default ""
 	depends on ADK_TARGET_WITH_INPUT
+	default ""
 	help
 	  Predefine the keyboard layout for the embedded system.
 
@@ -157,48 +161,48 @@ default ADK_ROOTSH_SASH if ADK_TARGET_UCLINUX
 default ADK_ROOTSH_MKSH
 
 config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  for the superuser.
 
 config ADK_ROOTSH_SASH
-	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
 	bool "sash (Shell compatible with non-MMU systems)"
+	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
 	help
 	  standalone shell.
 
 config ADK_ROOTSH_HUSH
-	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	bool "hush (Shell compatible with non-MMU systems)"
+	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	help
 	  hush shell from busybox.
 
 config ADK_ROOTSH_ASH
-	select BUSYBOX_ASH
 	bool "ash (busybox)"
+	select BUSYBOX_ASH
 	help
 	  Use the minimalistic ash variant that is part of busybox
 	  as standard login shell for the superuser. This is the
 	  default, but discouraged due to its frugality.
 
 config ADK_ROOTSH_BASH
-	select ADK_PACKAGE_BASH
 	bool "bash (GNU Bourne-Again Shell)"
+	select ADK_PACKAGE_BASH
 	help
 	  Use GNU bash as standard login shell for the superuser.
 
 config ADK_ROOTSH_TCSH
-	select ADK_PACKAGE_TCSH
 	bool "tcsh (Tenex C Shell)"
+	select ADK_PACKAGE_TCSH
 	help
 	  Use tcsh (a C Shell variant) as standard login shell
 	  for the superuser.
 
 config ADK_ROOTSH_ZSH
-	select ADK_PACKAGE_ZSH
 	bool "zsh (The Z Shell)"
+	select ADK_PACKAGE_ZSH
 	help
 	  Use zsh as standard login shell for the superuser.
 
@@ -210,50 +214,49 @@ default ADK_BINSH_SASH if ADK_TARGET_UCLINUX
 default ADK_BINSH_MKSH
 
 config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  both small and powerful, so quite suited for this task.
 
 config ADK_BINSH_SASH
-	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
 	bool "sash (Standalone Shell)"
+	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
 	help
 	  hush shell.
 
 config ADK_BINSH_HUSH
-	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	bool "hush (busybox)"
+	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	help
 	  hush shell.
 
 config ADK_BINSH_ASH
-	select BUSYBOX_ASH
 	bool "ash (busybox)"
+	select BUSYBOX_ASH
 	help
 	  Use the minimalistic ash variant that is part of busybox
 	  as system shell. This is the default and rather small and
 	  fast, but lacks scripting features.
 
 config ADK_BINSH_BASH
-	select ADK_PACKAGE_BASH
 	bool "bash (GNU Bourne-Again Shell)"
+	select ADK_PACKAGE_BASH
 	help
 	  Use GNU bash as system shell. This is discouraged due to
 	  its size and slowness.
 
 config ADK_BINSH_ZSH
-	select ADK_PACKAGE_ZSH
 	bool "zsh (The Z Shell)"
+	select ADK_PACKAGE_ZSH
 	help
 	  Use zsh as system shell. This is probably a bad idea.
 
 endchoice
 
 config ADK_SIMPLE_NETWORK_CONFIG
-	prompt "simple network configuration"
-	boolean
+	bool "simple network configuration"
 	help
 	  Manually change network config
 	  
@@ -272,6 +275,7 @@ config ADK_SIMPLE_NETWORK_CONFIG_ETH0_DHCP
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_NONE
 	bool "no configuration"
+
 endchoice
 
 choice
@@ -279,26 +283,26 @@ prompt "configure default Gateway"
 depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW
-	boolean "with Gateway"
+	bool "with Gateway"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITHOUT_GW
-	boolean "without Gateway"
+	bool "without Gateway"
 
 endchoice
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_IP
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC
 	string "IP Address"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC
 	default "10.0.0.2"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_NM
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC
 	string "Netmask"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC
 	default "255.255.255.0"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH0_GW
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW
 	string "Gateway"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW
 	default "10.0.0.1"
 
 endmenu
@@ -327,26 +331,26 @@ prompt "configure default Gateway"
 depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW
-	boolean "with Gateway"
+	bool "with Gateway"
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITHOUT_GW
-	boolean "without Gateway"
+	bool "without Gateway"
 
 endchoice
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_IP
-	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC
 	string "IP Address"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC
 	default "192.168.1.2"
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NM
-	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC
 	string "Netmask"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC
 	default "255.255.255.0"
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_GW
-	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW
 	string "Gateway"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW
 	default "192.168.1.1"
 
 endmenu
@@ -365,13 +369,13 @@ config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2
 endchoice
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID
-	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2
 	string "SSID"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2
 	default ""
 
 config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW
-	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2
 	string "Password"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2
 	default ""
 
 menu "eth1 Configuration"
@@ -390,6 +394,7 @@ config ADK_SIMPLE_NETWORK_CONFIG_ETH1_DHCP
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_NONE
 	bool "no configuration"
+
 endchoice
 
 choice
@@ -397,40 +402,40 @@ prompt "configure default Gateway"
 depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW
-	boolean "with Gateway"
+	bool "with Gateway"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITHOUT_GW
-	boolean "without Gateway"
+	bool "without Gateway"
 
 endchoice
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_IP
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC
 	string "IP Address"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC
 	default "172.16.0.2"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_NM
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC
 	string "Netmask"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC
 	default "255.255.0.0"
 
 config ADK_SIMPLE_NETWORK_CONFIG_ETH1_GW
-	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW
 	string "Gateway"
+	depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW
 	default "172.16.0.1"
 
 endmenu
 
 config ADK_SIMPLE_NETWORK_CONFIG_NS
+	string "Nameserver"
 	depends on ADK_SIMPLE_NETWORK_CONFIG
 	depends on !ADK_SIMPLE_NETWORK_CONFIG_ETH0_DHCP
 	depends on !ADK_SIMPLE_NETWORK_CONFIG_ETH1_DHCP
 	depends on !ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP
-	string "Nameserver"
 	default "10.0.0.1"
 
 config ADK_SIMPLE_NETWORK_CONFIG_PROXY
-	depends on ADK_SIMPLE_NETWORK_CONFIG
 	string "HTTP-Proxy (f.e. http://10.0.0.2:8080)"
+	depends on ADK_SIMPLE_NETWORK_CONFIG
 	default ""
 

+ 2 - 30
target/config/Config.in.target

@@ -41,36 +41,8 @@ config ADK_TARGET_CFLAGS
 
 config ADK_TARGET_CMDLINE
 	string
-	default "console=tty0" if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default "console=ttyAMA0" if ADK_TARGET_SYSTEM_ARM_FM
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_APU
-	default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_VGA
-	default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA
-	default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
-	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default "console=ttyAMA0,115200 console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_VGA
-	default "console=tty1 console=ttyAMA0,115200" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_SERIAL
-	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
-	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
-	default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default "console=tty0" if ADK_TARGET_VBOX
-	default "console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
-	default "console=ttyS0,9600" if ADK_TARGET_QEMU_PPC_MACPPC
-	default "console=ttyS0" if ADK_TARGET_QEMU_PPC_VIRTEX_ML507
-	default "console=ttyS0" if ADK_TARGET_QEMU_PPC_BAMBOO
-	default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_QEMU_XTENSA
+	default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default "geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default ""
 
 choice

+ 0 - 1
target/config/Config.in.toolchain

@@ -78,7 +78,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_24
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
-	depends on !ADK_TARGET_ARCH_M68K
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	bool "git"

+ 4 - 4
target/config/Config.in.x86.choice

@@ -7,19 +7,19 @@ depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TA
 default ADK_CPU_I486
 
 config ADK_CPU_I486
-        boolean "i486"
+        bool "i486"
         select ADK_i486
 
 config ADK_CPU_I586
-        boolean "i586"
+        bool "i586"
         select ADK_i586
 
 config ADK_CPU_I686
-        boolean "i686"
+        bool "i686"
         select ADK_i686
 
 config ADK_CPU_ATOM
-        boolean "atom"
+        bool "atom"
         select ADK_atom
 
 endchoice

+ 4 - 4
target/config/Config.in.x86.default

@@ -2,16 +2,16 @@
 # material, please see the LICENCE file in the top-level directory.
 
 config ADK_i486
-	boolean
+	bool
 
 config ADK_i586
-	boolean
+	bool
 
 config ADK_i686
-	boolean
+	bool
 
 config ADK_atom
-	boolean
+	bool
 
 config ADK_TARGET_X86_CPU
 	string

+ 1 - 0
target/mips/systems/dragino-ms14s

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	select ADK_CPU_MIPS32
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
+	select ADK_TARGET_WITH_SERIAL
 	help
 	  Support for Dragino2 ms14-s.
 

+ 1 - 0
target/mips/systems/mikrotik-rb4xx

@@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	select ADK_mikrotik_rb4xx
 	select ADK_CPU_MIPS32
 	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_LEDS

+ 1 - 0
target/mips/systems/mikrotik-rb532

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_little
 	select ADK_mikrotik_rb532
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND

+ 1 - 0
target/x86_64/systems/pcengines-apu

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_LINUX_64
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_ACPI

+ 5 - 0
toolchain/elf2flt/Makefile

@@ -6,7 +6,12 @@ include Makefile.inc
 include ../rules.mk
 include ${ADK_TOPDIR}/mk/buildhlp.mk
 
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
+BINUTILS_VERSION:=	git
+endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
 BINUTILS_VERSION:=	2.24
+endif
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured: