From 53c5aa9909dda24e7b770ffb62a3aae9d5d8e5d4 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 16 Jun 2017 21:01:51 +0000
Subject: [PATCH] [arm] Don't pass -mfpu=auto through to the assembler.

The assembler doesn't understand -mfpu=auto.  The easiest way to handle this
is to surpress this value from being passed through, while still passing
through legacy values.

	* config/arm/elf.h (ASM_SPEC): Only pass -mfpu through to the
	assembler when it is not -mfpu=auto.

From-SVN: r249281
---
 gcc/ChangeLog        | 5 +++++
 gcc/config/arm/elf.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1542ae3467df..5ea21b74716f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/elf.h (ASM_SPEC): Only pass -mfpu through to the
+	assembler when it is not -mfpu=auto.
+
 2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm.h (BIG_LITTLE_SPEC): Delete macro.
diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
index f119b87116ff..fcc4f3f81a91 100644
--- a/gcc/config/arm/elf.h
+++ b/gcc/config/arm/elf.h
@@ -64,7 +64,7 @@
 %{mapcs-*:-mapcs-%*} \
 %(subtarget_asm_float_spec) \
 %{mthumb-interwork:-mthumb-interwork} \
-%{mfloat-abi=*} %{mfpu=*} \
+%{mfloat-abi=*} %{!mfpu=auto: %{mfpu=*}} \
 %(subtarget_extra_asm_spec)"
 #endif
 
-- 
GitLab