50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
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
|
||
|
|
|