Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/Makefile.common	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -237,5 +237,5 @@
 
 # Flags for the compilation of C++ code.
-CPPFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(CPP_FLOAT) \
+CPPFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(CPP_ARCHSPEC) \
 	-imacros $(CONFIG_HEADER) \
 	-fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
Index: uspace/lib/c/arch/arm32/Makefile.common
===================================================================
--- uspace/lib/c/arch/arm32/Makefile.common	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/lib/c/arch/arm32/Makefile.common	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -30,4 +30,6 @@
 COMMON_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
 	-march=$(subst _,-,$(PROCESSOR_ARCH))
+CPP_ARCHSPEC= -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
+	-march=$(subst _,-,$(PROCESSOR_ARCH))
 
 LDFLAGS += -Wl,--gc-sections
@@ -35,4 +37,5 @@
 ifeq ($(CONFIG_FPU),y)
 	COMMON_CFLAGS += -mfloat-abi=hard
+	CPP_ARCHSPEC += -mfloat-abi=hard
 endif
 
Index: uspace/lib/c/arch/mips32/Makefile.common
===================================================================
--- uspace/lib/c/arch/mips32/Makefile.common	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/lib/c/arch/mips32/Makefile.common	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -28,5 +28,5 @@
 
 COMMON_CFLAGS += -msoft-float -mabi=32
-CPP_FLOAT = -msoft-float
+CPP_ARCHSPEC = -msoft-float -mabi=32
 AS_PROLOG = .module softfloat;.abicalls;
 LDFLAGS += -Wl,--gc-sections
Index: uspace/lib/c/arch/mips32eb/Makefile.common
===================================================================
--- uspace/lib/c/arch/mips32eb/Makefile.common	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/lib/c/arch/mips32eb/Makefile.common	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -28,4 +28,5 @@
 
 COMMON_CFLAGS += -msoft-float -mabi=32
+CPP_ARCHSPEC = -msoft-float -mabi=32
 AS_PROLOG = .module softfloat;.abicalls;
 LDFLAGS += -Wl,--gc-sections
Index: uspace/lib/cpp/Makefile
===================================================================
--- uspace/lib/cpp/Makefile	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/lib/cpp/Makefile	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -1,4 +1,4 @@
 #
-# Copyright (c) 2017 Jaroslav Jindrak
+# Copyright (c) 2018 Jaroslav Jindrak
 # All rights reserved.
 #
@@ -54,4 +54,5 @@
 	src/typeindex.cpp \
 	src/typeinfo.cpp \
+	src/__bits/glue.cpp \
 	src/__bits/runtime.cpp \
 	src/__bits/trycatch.cpp \
Index: uspace/lib/cpp/src/__bits/glue.cpp
===================================================================
--- uspace/lib/cpp/src/__bits/glue.cpp	(revision 15837931a1836a7dc044d546547b0f1120ed3ce2)
+++ uspace/lib/cpp/src/__bits/glue.cpp	(revision 6f025a80fc7ad329b44d6628d8299af5d7429898)
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018 Jaroslav Jindrak
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This file contains glue code that makes different
+ * architectures pass.
+ */
+
+#ifdef PLATFORM_arm
+
+/**
+ * ARM32 does not have GCC atomic operations inlined by
+ * the compiler, so we need to define stubs for our library
+ * to compile on this architecture.
+ */
+extern "C"
+{
+#define LIBCPP_GLUE_OP_AND_FETCH(NAME, OP, TYPE, SIZE) \
+    TYPE __sync_##NAME##_and_fetch_##SIZE (volatile void* vptr, TYPE val) \
+    { \
+        TYPE* ptr = (TYPE*)vptr; \
+        *ptr = *ptr OP val; \
+        return *ptr; \
+    }
+
+LIBCPP_GLUE_OP_AND_FETCH(add, +, unsigned, 4)
+LIBCPP_GLUE_OP_AND_FETCH(sub, -, unsigned, 4)
+
+#define LIBCPP_GLUE_CMP_AND_SWAP(TYPE, SIZE) \
+    TYPE __sync_compare_and_swap_##SIZE (TYPE* ptr, TYPE old_val, TYPE new_val) \
+    { \
+        if (*ptr == old_val) \
+            *ptr = new_val; \
+        return *ptr; \
+    }
+
+LIBCPP_GLUE_CMP_AND_SWAP(unsigned, 4)
+}
+#endif