From f9f3b564ac0db1a900d8e13e261f49815c224794 Mon Sep 17 00:00:00 2001
From: "Ithamar R. Adema" <ithamar@upgrade-android.com>
Date: Mon, 1 Sep 2014 15:28:49 +0200
Subject: [PATCH] ARM: only enable C++11 for libroot, not globally

This resembles the x86_64 build, and fixes the compilation issues
with the bootloader stdio.h header.

Fixes #11144
---
 build/jam/ArchitectureRules            | 3 ---
 src/system/libroot/os/arch/arm/Jamfile | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index da58c1d372..b7b68d6389 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -45,9 +45,6 @@ rule ArchitectureSetup architecture
 	if $(cpu) = arm {
 		# For stackcrawls
 		gccBaseFlags += -mapcs-frame ;
-
-		# C++11 is used to implement atomics.
-		HAIKU_C++FLAGS_$(architecture) += -std=c++11 ;
 	}
 
 	# activating graphite optimizations
diff --git a/src/system/libroot/os/arch/arm/Jamfile b/src/system/libroot/os/arch/arm/Jamfile
index d22221ba31..8e4a64bc20 100644
--- a/src/system/libroot/os/arch/arm/Jamfile
+++ b/src/system/libroot/os/arch/arm/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src system libroot os arch arm ;
 
+SubDirC++Flags -std=gnu++11 ;
+
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup arm ] {
 	on $(architectureObject) {