diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index b7b68d6389..da58c1d372 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -45,6 +45,9 @@ 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/build/jam/board/beagle/BoardSetup b/build/jam/board/beagle/BoardSetup
index ddf5442dc3..c4fe60536a 100644
--- a/build/jam/board/beagle/BoardSetup
+++ b/build/jam/board/beagle/BoardSetup
@@ -62,17 +62,11 @@ HAIKU_BOARD_SDIMAGE_FILES =
 
 #
 # gcc flags for the specific cpu
-#
 
-HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH)
-	+= -mcpu=cortex-a8 -mfpu=vfpv3 -mfloat-abi=hard
-	   -DHAIKU_BOARD_LOADER_STACK_BASE=$(HAIKU_BOARD_LOADER_STACK_BASE)
-	   -DHAIKU_BOARD_LOADER_UIBASE=$(HAIKU_BOARD_LOADER_UIBASE) ;
-HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH)
-	+= -mcpu=cortex-a8 -mfpu=vfpv3 -mfloat-abi=hard
-	   -DHAIKU_BOARD_LOADER_STACK_BASE=$(HAIKU_BOARD_LOADER_STACK_BASE)
-	   -DHAIKU_BOARD_LOADER_UIBASE=$(HAIKU_BOARD_LOADER_UIBASE) ;
-HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)
-	+= -mcpu=cortex-a8 -mfpu=vfpv3 -mfloat-abi=hard -std=c++11
+local flags = -mcpu=cortex-a8 -mfpu=vfpv3 -mfloat-abi=hard
 	   -DHAIKU_BOARD_LOADER_STACK_BASE=$(HAIKU_BOARD_LOADER_STACK_BASE)
 	   -DHAIKU_BOARD_LOADER_UIBASE=$(HAIKU_BOARD_LOADER_UIBASE) ;
+
+HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;
+HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;
+HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;