diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-13 07:42:04 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-13 07:42:04 -0700 |
| commit | 6e207824af267eea8777949ccf6d0584accd55a0 (patch) | |
| tree | 15c43801d564c5210cd2c6b4b269d0ef75edadb4 /core | |
| parent | 06b1a47fe19699e8cb94fd6a007f82f3b41119fe (diff) | |
| parent | 572d0d7dd3ceaab12911f403689c01589602a3f4 (diff) | |
| download | build-6e207824af267eea8777949ccf6d0584accd55a0.zip build-6e207824af267eea8777949ccf6d0584accd55a0.tar.gz build-6e207824af267eea8777949ccf6d0584accd55a0.tar.bz2 | |
resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 5bfcda4..28c031d 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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 |