diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-21 00:17:59 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-21 00:17:59 +0200 |
| commit | a28a53fcf80a9c03dd57b925bc4c70e6a2790c10 (patch) | |
| tree | 4e025c65315aff423f8d64c203787664aa24e4bd | |
| parent | 673eef187777f4283aa2f90027f1b2ee3dadebe0 (diff) | |
| parent | 541389b6985e7f2bcad540db4027f2f7f95dd34f (diff) | |
merged OPEN-99: use -march=pentium* for 32-bit builds only
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/00-Common.cmake | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5f209a6675..5baaf6d12e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -148,6 +148,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + OPEN-99 SNOW-278 VWR-233 WEB-262 diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 25cc05332b..0c7d687add 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -169,7 +169,10 @@ if (LINUX) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) - add_definitions(-march=pentium4 -mfpmath=sse) + if (WORD_SIZE EQUAL 32) + add_definitions(-march=pentium4) + endif (WORD_SIZE EQUAL 32) + add_definitions(-mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime |