From patchwork Thu Nov 8 23:08:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 995230 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42rf8s5jGsz9s8J for ; Fri, 9 Nov 2018 10:08:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 677F62F5B9; Thu, 8 Nov 2018 23:08:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hLERROtlFvaa; Thu, 8 Nov 2018 23:08:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5F25F226C2; Thu, 8 Nov 2018 23:08:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CA0021C1FF7 for ; Thu, 8 Nov 2018 23:08:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C7020226B8 for ; Thu, 8 Nov 2018 23:08:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vt49MoNw0RCj for ; Thu, 8 Nov 2018 23:08:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by silver.osuosl.org (Postfix) with ESMTPS id 1737B221F5 for ; Thu, 8 Nov 2018 23:08:18 +0000 (UTC) Received: from localhost.localdomain ([178.7.127.78]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MLi1v-1gLicX3ssl-000wGn for ; Fri, 09 Nov 2018 00:08:15 +0100 From: Peter Seiderer To: buildroot@buildroot.org Date: Fri, 9 Nov 2018 00:08:14 +0100 Message-Id: <20181108230814.4773-1-ps.report@gmx.net> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:MipKErpxsjXlFXiSuLBXtW0dBvHbzVWulVtMfmKbiHPJYH4JVox GcGkPqXnTL8/bw3IIc5l8zfgDqVJFpgloFkiieZv5LkdkxW3OiCoWc/GbWdTCUi8Kb6mLRV ZO3lZ1lJxJKA1CcN+7Ngw+/XL5lQTazvpPsADsWh+80MmtQvG8StUoJGP9tbgJklgJBpSv0 HNkDrl15gxQz80XOmcfDA== X-UI-Out-Filterresults: notjunk:1; V01:K0:wWpnXV04RfI=:p93EZjNgVA1nAOovpJWzDe 6x1B4ZfH1SHeJ2mueYPyjE7FqYZbCUm79ySeS9bcnQL3Dt0lJDl3p5aK+MspyiSJSlsVouO1c Efs8T2o/l1LoQoTcGpycefiOiDBQx5LSy07zSQw8du2EPFfQxUZ7yFbdMUUf33eTHflIyLkJQ y9T/fhF1OaXiJWd+pINvQzumJseX/FOLOuf8GOvgWR4Lg7hbMWHkGku/wto984+52oPnuE4AB caC3jJYibDDyIxr88hUMs2SsaRKXeBFmVoc4nxCaB1Ik4zdl4OzZaohPFt6tqr3gJ86QOzk2j f1+os8g6YaRYEgN8SCtrvonqDI78+0qrl+bNyFA+kSlq5tY/w30VJLGMnWv400KjaBj0475ye DqErlQ+3Iz2PEKA+UMi3LPGd/V0EtTeR+Q6x4SCCfq7D2gYw5D+Gha0I3PxjKOzoTlFqJwMLM X1OqMutA4ZVFp9JDdmPbU3r6otxdAVt5bMWYnVzZ6h1se6kDvCX87wDh+GOpC69jBIezwiBzV BcFQC7l57wTL2xkzM2VLeyymk9hsS0Mom1Yy3Qe14aGqYrKQq8El+XOrJoojSWBnIBJh5f8JR yxVeaVs+DJq/lttjhJ7lWSe0C8JLedG9JqEJkBQRX+PyGGN/O0ZAx6HjLF8e8rmveQwFtnGa0 2nL5WttjLevCIuUpfVzhpFSGDbWJMdGk242ZqkCOKT7n9mcPmj9JH63ut/YVJJ0Bc6zVO6IA/ 1mhPGXucW+fcxluRKGoNAIa8hgRX4ZauuSwyj60bbc6+l2ajm0hZBeEHcPwV/T7mxcNjsxjmV 9X2A3XHSLF+AUEksr8XqYOlXadvKeTf6+FRS1QHoNTJo3uDh7PPV4h/EYEZGTP/EBoQ/f7all XEjJalbpsNjJxEA6YYiSFa1xMVOgYKseGuO+5JO30= Subject: [Buildroot] [PATCH v1] valgrind: fix mips64 compile X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Disable gcc march mips64r2 detection (use compile flags already set by buildroot only), avoids double setting like '-march=mips64 ... -march=mips64r2 -mabi=64'. 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 --- ...disable-gcc-march-mips64r2-detection.patch | 58 +++++++++++++++++++ package/valgrind/valgrind.mk | 3 + 2 files changed, 61 insertions(+) create mode 100644 package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch diff --git a/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch b/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch new file mode 100644 index 0000000000..75874fe7fd --- /dev/null +++ b/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch @@ -0,0 +1,58 @@ +From a4584ead274388b91b05b94bad2452a5f0ad3530 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +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 +--- + configure.ac | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c18ae5f2a..70bfe1bb6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1769,21 +1769,21 @@ case "${host_cpu}" in + + + # does this compiler support -march=mips64r2 (mips64r2 default) ? +- AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64]) ++ #AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64]) + +- safe_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -march=mips64r2 -mabi=64 -Werror" ++ #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]) +- ], [ ++ #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_MSG_RESULT([no]) ++ #]) ++ #CFLAGS=$safe_CFLAGS + + AC_SUBST(FLAG_M64) + ;; +-- +2.19.1 + diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 459de4907e..67b2854f86 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -13,6 +13,9 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES +# Patch 0001-configure.ac-disable-gcc-march-mips64r2-detection.patch +# touches configure.ac +VALGRIND_AUTORECONF = YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in