All ARM32 builds target ARMv7-a

Author: grendello

src/gas/llvm_mc_runner.hh

@@ -162,10 +162,15 @@ namespace xamarin::android::gas
 			return iter->second;
 		}
 
+		void append_attribute (std::string const& new_attr)
+		{
+			set_option (LlvmMcArgument::Mattr, new_attr);
+		}
+
 		void append_attributes (std::vector<std::string> const& new_attrs)
 		{
 			for (std::string const& attr : new_attrs) {
-				set_option (LlvmMcArgument::Mattr, attr);
+				append_attribute (attr);
 			}
 		}
 
@@ -193,7 +198,10 @@ namespace xamarin::android::gas
 	public:
 		LlvmMcRunnerARM32 ()
 			: LlvmMcRunner (LlvmMcArchitecture::ARM32)
-		{}
+		{
+			// We always target ARMv7-a
+			append_attribute ("+armv7-a");
+		}
 
 		virtual ~LlvmMcRunnerARM32 ()
 		{}

src/gas/llvm_mc_runner_arm32.cc

@@ -46,8 +46,8 @@ std::unordered_map<std::string, std::vector<std::string>> LlvmMcRunnerARM32::fpu
 	{ "vfp10-r0",               {}}, // no llvm-mc equivalent?
 	{ "vfp9",                   {}}, // no llvm-mc equivalent?
 	{ "vfpv2",                  {"+vfp2"}},
-	{ "vfpv3",                  {"+vfp3", "+thumb2"}},
-	{ "vfp3",                   {"+vfp3", "+thumb2"}}, // undocumented GAS option, alias for vfpv3 above
+	{ "vfpv3",                  {"+vfp3"}},
+	{ "vfp3",                   {"+vfp3"}}, // undocumented GAS option, alias for vfpv3 above
 	{ "vfpv3-d16",              {"+vfp3d16"}},
 	{ "vfpv3-d16-fp16",         {"vfp3d16,+fp16"}},
 	{ "vfpv3-fp16",             {"+vfp3,+fp16"}},