diff -uNr emacs/Makefile emacs-new/Makefile
--- emacs/Makefile	2015-03-09 02:04:17.000000000 -0700
+++ emacs-new/Makefile	2015-04-03 09:28:07.000000000 -0700
@@ -176,13 +176,6 @@
 
 .include <bsd.port.options.mk>
 
-# clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment
-# and %esi as frame pointer register
-# http://llvm.org/bugs/show_bug.cgi?id=18171
-.if ${ARCH} == "i386"
-USE_GCC=		any
-.endif
-
 DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
 
 .if ${PORT_OPTIONS:MX11}