Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Sun, 2 Jun 2019 20:11:20 +0000 (22:11 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 2 Jun 2019 20:11:20 +0000 (22:11 +0200)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
12 files changed:
1  2 
DEVELOPERS
arch/Config.in.powerpc
boot/optee-os/Config.in
package/dropbear/dropbear.mk
package/gcc/Config.in.host
package/gpsd/gpsd.mk
package/gstreamer1/gst1-plugins-bad/Config.in
package/linux-headers/Config.in.host
package/mender/mender.mk
package/opencv3/opencv3.mk
package/samba4/samba4.mk
package/wpewebkit/Config.in

diff --cc DEVELOPERS
Simple merge
Simple merge
Simple merge
Simple merge
index b477fe56e7bd7ceb124bd0cad8e7f7664e1956c2,4b7f11f3b1e4c17b0f44912a875c96267f0d2318..bf22d1b84322f88cc1a1a6ecd38cf1f6e70e8fe4
@@@ -65,10 -76,8 +76,11 @@@ config BR2_GCC_VERSION_7_
  config BR2_GCC_VERSION_8_X
        bool "gcc 8.x"
        # Broken or unsupported architectures
+       depends on !BR2_csky
        depends on !BR2_or1k
 +      # powerpc spe support has been deprecated since gcc 8.x.
 +      # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
 +      depends on !BR2_powerpc_SPE
        select BR2_TOOLCHAIN_GCC_AT_LEAST_8
  
  endchoice
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 39f64c4e54c60b135a2c180e038e51aaeb4fbb8c,ff5775c7355f32b411c12f1227412959d91949ab..2808a3c8b334a8d6fb2a25f2e33526c86fa3e220
@@@ -12,23 -12,7 +12,7 @@@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPO
        depends on BR2_TOOLCHAIN_HAS_SYNC_4
        depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
  
- config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT
-       bool
-       # ARM needs NEON for JIT.
-       default y if BR2_ARM_CPU_HAS_NEON
-       # AArch64 is supported upstream but not well tested on big-endian mode.
-       default y if BR2_aarch64
-       # i386 & x86_64 don't have any special requirements.
-       default y if BR2_i386
-       default y if BR2_x86_64
-       # JIT is known not to work on MIPS64.
-       # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6
-       # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258
-       # The MIPS support is completely untested in big-endian mode.
-       default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2
-       default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5
 -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8"
 +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 6, host gcc >= 4.8"
        depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
        depends on !BR2_BINFMT_FLAT
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \