Merge 8a694ebc4a into 0669234315

Makefile

@@ -10,8 +10,11 @@ PROC?=$(shell uname -m)
 
 CC=gcc 
 CFLAGS=-fPIC -O3 -fomit-frame-pointer -fno-exceptions -Wall -std=c99 -pedantic
+MODEL=$(cat /proc/device-tree/model)
 ifeq (${PROC},x86_64)
 	CFLAGS+=-m64 -mtune=generic
+else ifneq (,$(findstring "Raspberry Pi", $(MODEL)))
+	-march=armv7
 else
 	CFLAGS+=-m32 -march=i686
 endif