From c44472c541b5e8f42c7aca8a51b1f3dff0bb9b10 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 1 Aug 2018 19:09:22 -0400
Subject: [PATCH] Enable use of Clang's integrated assembler.

---
 build/jam/ArchitectureRules | 5 +----
 configure                   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index de08e22ad4..7e28f03db7 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -474,12 +474,9 @@ rule ArchitectureSetupWarnings architecture
 	}
 
 	if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
-		# We need -integrated-as, as otherwise Clang uses GCC as assembler and
-		# passes -fheinous-gnu-extensions to GCC, which GCC does not understand
-		# then errors out.
 		AppendToConfigVar CCFLAGS :
 			HAIKU_TOP src system libroot posix glibc :
-			-integrated-as -fgnu89-inline -fheinous-gnu-extensions : global ;
+			-fgnu89-inline -fheinous-gnu-extensions : global ;
 	}
 
 	EnableWerror src add-ons accelerants ;
diff --git a/configure b/configure
index dd17c1f7e9..c4c3ed525c 100755
--- a/configure
+++ b/configure
@@ -908,7 +908,7 @@ else
 
 		# prepare gcc settings and get the actual target architecture
 		if [ $useClang = 1 ]; then
-			gcc="$HAIKU_clang -target ${targetMachine} -no-integrated-as"
+			gcc="$HAIKU_clang -target ${targetMachine}"
 			if [ ! -z "${crossToolsPrefix}" ]; then
 				gcc="$gcc -B ${crossToolsPrefix}"
 			fi