rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
bsp/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch Normal file
View File

@@ -0,0 +1,49 @@
From 1fd5a3d2adf04bad6ae6e9eef9caead7d46d9307 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Thu, 8 Nov 2018 23:55:30 +0100
Subject: [PATCH] configure.ac: disable gcc march mips64r2 detection
Disable gcc march mips64r2 detection, compile flags already
set by buildroot, fixes [1]:
error: '-mips64r2' conflicts with the other architecture options, which specify a mips64 processor
[1] http://autobuild.buildroot.net/results/34f6e2352f1559f98c724fe5394db0035b42ddb1
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas: remove code instead of commenting it]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
configure.ac | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 289514ff1..18cf97ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1768,22 +1768,7 @@ case "${host_cpu}" in
AC_SUBST(FLAG_M32)
- # does this compiler support -march=mips64r2 (mips64r2 default) ?
- AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64])
-
- safe_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -march=mips64r2 -mabi=64 -Werror"
-
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
- return 0;
- ]])], [
- FLAG_M64="-march=mips64r2 -mabi=64"
- AC_MSG_RESULT([yes])
- ], [
FLAG_M64=""
- AC_MSG_RESULT([no])
- ])
- CFLAGS=$safe_CFLAGS
AC_SUBST(FLAG_M64)
;;
--
2.19.1

99
bsp/buildroot/package/valgrind/0004-Fixes-for-musl-libc.patch
View File

@@ -1,99 +0,0 @@
From 50859f3577418cc42f76e1319e699202a615bbe1 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sat, 31 Oct 2015 19:45:04 +0100
Subject: [PATCH] Fixes for musl libc.
- add musl libc detection (prevents configure error)
- adjust preload and symbol names (based on the OpenWrt
patch, see [1])
[1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
configure.ac | 16 ++++++++++++++--
coregrind/vg_preloaded.c | 2 +-
include/pub_tool_redir.h | 9 ++++++++-
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8ab7f9b..e865bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,6 +1009,13 @@ if test x$VGCONF_PLATFORM_PRI_CAPS = xX86_SOLARIS \
GLIBC_VERSION="solaris"
fi
+# GLIBC_VERSION is empty if a musl libc is used, so use the toolchain tuple
+# in this case.
+if test x$GLIBC_VERSION = x; then
+ if $CC -dumpmachine | grep -q musl; then
+ GLIBC_VERSION=musl
+ fi
+fi
AC_MSG_CHECKING([the glibc version])
@@ -1064,10 +1071,15 @@ case "${GLIBC_VERSION}" in
# DEFAULT_SUPP set in host_os switch-case above.
# No other suppression file is used.
;;
+ musl)
+ AC_MSG_RESULT(Musl)
+ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
+ # no DEFAULT_SUPP file yet for musl libc.
+ ;;
2.0|2.1|*)
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later, uClibc,])
+ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc])
;;
esac
diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index 2ea7a7a..7b51aba 100644
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -56,7 +56,7 @@
void VG_NOTIFY_ON_LOAD(freeres)( void );
void VG_NOTIFY_ON_LOAD(freeres)( void )
{
-# if !defined(__UCLIBC__) \
+# if !defined(__UCLIBC__) && !defined(MUSL_LIBC) \
&& !defined(VGPV_arm_linux_android) \
&& !defined(VGPV_x86_linux_android) \
&& !defined(VGPV_mips32_linux_android) \
diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index bac00d7..babcf9a 100644
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -242,8 +242,11 @@
/* --- Soname of the standard C library. --- */
#if defined(VGO_linux) || defined(VGO_solaris)
+# if defined(MUSL_LIBC)
+# define VG_Z_LIBC_SONAME libcZdZa // libc.*
+#else
# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
-
+#endif
#elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
# define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
@@ -274,7 +277,11 @@
/* --- Soname of the pthreads library. --- */
#if defined(VGO_linux)
+# if defined(MUSL_LIBC)
+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
+#else
# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
+#endif
#elif defined(VGO_darwin)
# define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
#elif defined(VGO_solaris)
--
2.1.4

8
bsp/buildroot/package/valgrind/Config.in
View File

@@ -1,7 +1,13 @@
config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS
bool
default y if BR2_aarch64
default y if BR2_ARM_CPU_ARMV7A
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
# MIPS32 R6 is unsupported
default y if BR2_mips && !BR2_mips_32r6
default y if BR2_mipsel && !BR2_mips_32r6
# MIPS64 R6 is unsupported
default y if BR2_mips64 && !BR2_mips_64r6
default y if BR2_mips64el && !BR2_mips_64r6
default y if BR2_i386 || BR2_x86_64
default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
depends on !BR2_MIPS_SOFT_FLOAT

6
bsp/buildroot/package/valgrind/valgrind.hash
View File

@@ -1,2 +1,6 @@
# From http://valgrind.org/downloads/current.html
md5 6eb03c0c10ea917013a7622e483d61bb valgrind-3.12.0.tar.bz2
md5 74175426afa280184b62591b58c671b3 valgrind-3.14.0.tar.bz2
# License files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS

19
bsp/buildroot/package/valgrind/valgrind.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
VALGRIND_VERSION = 3.12.0
VALGRIND_SITE = http://valgrind.org/downloads
VALGRIND_VERSION = 3.14.0
VALGRIND_SITE = ftp://sourceware.org/pub/valgrind
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
VALGRIND_LICENSE = GPL-2.0, GFDL-1.2
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
@@ -13,8 +13,8 @@ VALGRIND_CONF_OPTS = \
--disable-ubsan \
--without-mpicc
VALGRIND_INSTALL_STAGING = YES
# patch 0004-Fixes-for-musl-libc.patch touching configure.ac
# Patch 0003-configure.ac-disable-gcc-march-mips64r2-detection.patch
# touches configure.ac
VALGRIND_AUTORECONF = YES
# Valgrind must be compiled with no stack protection, so forcefully
@@ -34,11 +34,14 @@ VALGRIND_CFLAGS = \
# and pass the right -march option, so they take precedence over
# Valgrind's wrongfully detected value.
ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
VALGRIND_CFLAGS += -march=$(BR2_GCC_TARGET_ARCH)
VALGRIND_CFLAGS += -march="$(GCC_TARGET_ARCH)"
endif
VALGRIND_CONF_ENV = CFLAGS="$(VALGRIND_CFLAGS)"
# fix uclibc configure c99 support detection
VALGRIND_CONF_ENV += ac_cv_prog_cc_c99='-std=gnu99'
# On ARM, Valgrind only supports ARMv7, and uses the arch part of the
# host tuple to determine whether it's being built for ARMv7 or
# not. Therefore, we adjust the host tuple to specify we're on
@@ -49,6 +52,12 @@ VALGRIND_CONF_OPTS += \
--host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME))
endif
ifeq ($(BR2_GCC_ENABLE_LTO),y)
VALGRIND_CONF_OPTS += --enable-lto
else
VALGRIND_CONF_OPTS += --disable-lto
endif
define VALGRIND_INSTALL_UCLIBC_SUPP
$(INSTALL) -D -m 0644 package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp
endef