ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142 from Sonicadvance1/fPIC_x86_64 

Enable -fPIC on x86_64.
This commit is contained in:
Gregory Hainaut 2014-07-30 00:01:08 +02:00
parent bfa2bbef85 8c07d4e7b9
commit f38c6d0995
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/BuildParameters.cmake
View File

@ -92,6 +92,9 @@ if(_ARCH_64 AND 64BIT_BUILD)
set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu") set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu")
endif() endif()
# x86_64 requires -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(ARCH_FLAG "-m64 -msse -msse2") set(ARCH_FLAG "-m64 -msse -msse2")
add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1) add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1)
set(_ARCH_64 1) set(_ARCH_64 1)
@ -113,6 +116,13 @@ else()
set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu") set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
endif() endif()
# * -fPIC option was removed for multiple reasons.
# - Code only supports the x86 architecture.
# - code uses the ebx register so it's not compliant with PIC.
# - Impacts the performance too much.
# - Only plugins. No package will link to them.
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
set(ARCH_FLAG "-m32 -msse -msse2 -march=i686") set(ARCH_FLAG "-m32 -msse -msse2 -march=i686")
add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1) add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1)
set(_ARCH_32 1) set(_ARCH_32 1)
@ -120,13 +130,6 @@ else()
set(_M_X86_32 1) set(_M_X86_32 1)
endif() endif()
# * -fPIC option was removed for multiple reasons.
# - Code only supports the x86 architecture.
# - code uses the ebx register so it's not compliant with PIC.
# - Impacts the performance too much.
# - Only plugins. No package will link to them.
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# if no build type is set, use Devel as default # if no build type is set, use Devel as default
# Note without the CMAKE_BUILD_TYPE options the value is still defined to "" # Note without the CMAKE_BUILD_TYPE options the value is still defined to ""
@ -183,11 +186,12 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
# Remove -rdynamic option that can some segmentation fault when openining pcsx2 plugins # Remove -rdynamic option that can some segmentation fault when openining pcsx2 plugins
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
# Remove -fPIC option. No good reason to use it for plugins. Moreover we if(_ARCH_32)
# only support x86 architecture. And last but not least it impact the performance. # Remove -fPIC option on 32bit architectures.
# Long term future note :), amd64 build will need the -fPIC flags # No good reason to use it for plugins, also it impacts performance.
set(CMAKE_SHARED_LIBRARY_C_FLAGS "") set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
endif()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Set some default compiler flags # Set some default compiler flags