diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-21 00:09:17 +0200 | 
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-21 00:09:17 +0200 | 
| commit | 0488142b93b6a5cc804a98e28e5dedc28cd4ea54 (patch) | |
| tree | bf3a3eb7d2f3e75669344f23a4712eb3b0d38cae | |
| parent | cd13bc0e044d5014a0d7e131ae9d47924e376997 (diff) | |
OPEN-99: use -march=pentium3 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 2cc8fa5e5f..d9e1dd9afb 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=pentium3 -mfpmath=sse -ftree-vectorize) +    if (WORD_SIZE EQUAL 32) +      add_definitions(-march=pentium3) +    endif (WORD_SIZE EQUAL 32) +    add_definitions(-mfpmath=sse -ftree-vectorize)      if (NOT STANDALONE)        # this stops us requiring a really recent glibc at runtime        add_definitions(-fno-stack-protector) | 
