am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

* commit '6e207824af267eea8777949ccf6d0584accd55a0':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
This commit is contained in:
Jean-Baptiste Queru 2012-06-13 07:44:31 -07:00 committed by Android Git Automerger
commit 41a3fb3707

View file

@ -104,7 +104,7 @@ TARGET_GLOBAL_CPPFLAGS += \
# however, there have been reports that this is sometimes not the case. So make
# them explicit here unless we have the time to carefully check it
#
TARGET_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse
TARGET_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32
# XXX: These flags should not be defined here anymore. Instead, the Android.mk
# of the modules that depend on these features should instead check the