Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fortify on release doesn't work and throws warnings on F18

Browse Source
This commit is contained in:
Siana Gearz
2013-05-27 08:48:45 +02:00
parent 7c675af943
commit 6fca791632
3 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/cmake/00-Common.cmake
View File

@@ -103,6 +103,8 @@ if (LINUX)
-pthread -pthread
) )
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2 ")
# Don't catch SIGCHLD in our base application class for the viewer # 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! # some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh!
# The viewer doesn't need to catch SIGCHLD anyway. # The viewer doesn't need to catch SIGCHLD anyway.
@@ -136,16 +138,6 @@ if (LINUX)
OUTPUT_VARIABLE CXX_VERSION OUTPUT_VARIABLE CXX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
# Here's a giant hack for Fedora 8, where we can't use
# _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1.
if (${GXX_VERSION} STREQUAL ${CXX_VERSION})
add_definitions(-D_FORTIFY_SOURCE=2)
else (${GXX_VERSION} STREQUAL ${CXX_VERSION})
if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
add_definitions(-D_FORTIFY_SOURCE=2)
endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
#Lets actually get a numerical version of gxx's version #Lets actually get a numerical version of gxx's version
STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION}) STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
@@ -190,10 +182,6 @@ if (LINUX)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
endif (${ARCH} STREQUAL "x86_64") endif (${ARCH} STREQUAL "x86_64")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_definitions(
-D_FORTIFY_SOURCE=2
)
if (NOT STANDALONE) if (NOT STANDALONE)
# this stops us requiring a really recent glibc at runtime # this stops us requiring a really recent glibc at runtime
add_definitions(-fno-stack-protector) add_definitions(-fno-stack-protector)
@@ -206,9 +194,6 @@ if (LINUX)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
add_definitions(
-D_FORTIFY_SOURCE=2
)
if (NOT STANDALONE) if (NOT STANDALONE)
# this stops us requiring a really recent glibc at runtime # this stops us requiring a really recent glibc at runtime

5
indra/newview/llagent.cpp
View File

@@ -885,11 +885,6 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// getRegion() // getRegion()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
LLViewerRegion *LLAgent::getRegion() const
{
return mRegionp;
}
const LLHost& LLAgent::getRegionHost() const const LLHost& LLAgent::getRegionHost() const
{ {

2
indra/newview/llagent.h
View File

@@ -242,7 +242,7 @@ private:
//-------------------------------------------------------------------- //--------------------------------------------------------------------
public: public:
void setRegion(LLViewerRegion *regionp); void setRegion(LLViewerRegion *regionp);
LLViewerRegion *getRegion() const; LLViewerRegion *getRegion() const { return mRegionp; }
const LLHost& getRegionHost() const; const LLHost& getRegionHost() const;
BOOL inPrelude(); BOOL inPrelude();
std::string getSLURL() const; //Return uri for current region std::string getSLURL() const; //Return uri for current region