diff --git a/src/osd/sdl/osinline.h b/src/osd/sdl/osinline.h
index 0a9c6f428a8..20a5ad62509 100644
--- a/src/osd/sdl/osinline.h
+++ b/src/osd/sdl/osinline.h
@@ -83,6 +83,9 @@ _osd_exchange64(INT64 volatile *ptr, INT64 exchange)
 
 #endif /* __ppc64__ || __PPC64__ */
 
+#else
+
+#error "no matching assembler implementations found - please compile with NOASM=1"
 
 #endif
 
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 16b6c9e7904..fa93477786b 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -79,6 +79,9 @@ USE_DISPATCH_GL = 1
 # uncomment to disable MIDI
 # NO_USE_MIDI = 1
 
+# uncomment to disable implementations based on assembler code
+# NOASM = 1
+
 ###########################################################################
 ##################   END USER-CONFIGURABLE OPTIONS   ######################
 ###########################################################################
@@ -459,6 +462,11 @@ endif
 ifeq ($(findstring 4.8.,$(TEST_GCC)),4.8.)
 	CCOMFLAGS += -Wno-narrowing -Wno-attributes -Wno-unused-local-typedefs -Wno-unused-variable -Wno-array-bounds -Wno-strict-overflow
 endif
+
+# disable the cast alignment warnings for the Rasberry Pi
+ifeq ($(findstring rpi,$(TEST_GCC)),rpi)
+	CCOMFLAGS += -Wno-cast-align
+endif
 endif
 
 #-------------------------------------------------