11 Oct
2014
11 Oct
'14
1:36 p.m.
Author: akhaldi
Date: Sat Oct 11 13:36:08 2014
New Revision: 64666
URL: http://svn.reactos.org/svn/reactos?rev=64666&view=rev
Log:
[CMAKE/BASEADDRESS]
* Take the dwarf builds (NO_ROSSYM on) into account when assigning base addresses.
* Dedicated to V.
Added:
trunk/reactos/cmake/baseaddress_dwarf.cmake (with props)
Modified:
trunk/reactos/CMakeLists.txt
Modified: trunk/reactos/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=64666&a…
==============================================================================
--- trunk/reactos/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Oct 11 13:36:08 2014
@@ -221,7 +221,11 @@
add_subdirectory(include/reactos/mc)
add_subdirectory(include/asm)
- include(cmake/baseaddress.cmake)
+ if(NO_ROSSYM)
+ include(cmake/baseaddress_dwarf.cmake)
+ else()
+ include(cmake/baseaddress.cmake)
+ endif()
# For MSVC builds, this puts all debug symbols file in the same directory.
set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb")
Added: trunk/reactos/cmake/baseaddress_dwarf.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_dwarf.cm…
==============================================================================
--- trunk/reactos/cmake/baseaddress_dwarf.cmake (added)
+++ trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] Sat Oct 11 13:36:08 2014
@@ -0,0 +1,329 @@
+set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000
+set(baseaddress_kernel32 0x77ca0000)
+set(baseaddress_msvcrt 0x77b90000)
+set(baseaddress_advapi32 0x77aa0000)
+set(baseaddress_gdi32 0x77a20000)
+set(baseaddress_user32 0x77820000)
+set(baseaddress_dhcpcsvc 0x777c0000)
+set(baseaddress_dnsapi 0x77760000)
+set(baseaddress_icmp 0x77730000)
+set(baseaddress_iphlpapi 0x776e0000)
+set(baseaddress_ws2_32 0x77690000)
+set(baseaddress_ws2help 0x77660000)
+set(baseaddress_shlwapi 0x775a0000)
+set(baseaddress_rpcrt4 0x77490000)
+set(baseaddress_comctl32 0x772b0000)
+set(baseaddress_ole32 0x77020000)
+set(baseaddress_winspool.drv 0x76fe0000)
+set(baseaddress_winmm 0x76f20000)
+set(baseaddress_comdlg32 0x76e10000)
+set(baseaddress_shell32 0x76010000)
+set(baseaddress_lz32 0x75ff0000)
+set(baseaddress_version 0x75fb0000)
+set(baseaddress_oleaut32 0x75d60000)
+set(baseaddress_setupapi 0x75b50000)
+set(baseaddress_mpr 0x75b00000)
+set(baseaddress_crypt32 0x759a0000)
+set(baseaddress_wininet 0x758b0000)
+set(baseaddress_urlmon 0x75760000)
+set(baseaddress_psapi 0x75720000)
+set(baseaddress_imm32 0x756d0000)
+set(baseaddress_msvfw32 0x75680000)
+set(baseaddress_dbghelp 0x75590000)
+set(baseaddress_devmgr 0x754f0000)
+set(baseaddress_msacm32 0x754a0000)
+set(baseaddress_netapi32 0x75420000)
+set(baseaddress_powrprof 0x753e0000)
+set(baseaddress_secur32 0x75390000)
+set(baseaddress_wintrust 0x75320000)
+set(baseaddress_avicap32 0x752f0000)
+set(baseaddress_cabinet 0x75290000)
+set(baseaddress_dsound 0x751f0000)
+set(baseaddress_glu32 0x750a0000)
+set(baseaddress_opengl32 0x74d90000)
+set(baseaddress_riched20 0x74cd0000)
+set(baseaddress_smdll 0x74cb0000)
+set(baseaddress_userenv 0x74c50000)
+set(baseaddress_uxtheme 0x74bd0000)
+set(baseaddress_cryptui 0x74b10000)
+set(baseaddress_csrsrv 0x74ad0000)
+set(baseaddress_basesrv 0x74a90000)
+set(baseaddress_consrv 0x74a70000)
+set(baseaddress_winsrv 0x74980000)
+set(baseaddress_dplayx 0x748f0000)
+set(baseaddress_gdiplus 0x747e0000)
+set(baseaddress_msimg32 0x747b0000)
+set(baseaddress_mswsock 0x74780000)
+set(baseaddress_oledlg 0x74730000)
+set(baseaddress_rasapi32 0x746f0000)
+set(baseaddress_rsaenh 0x74670000)
+set(baseaddress_samlib 0x74620000)
+set(baseaddress_sensapi 0x745f0000)
+set(baseaddress_sfc_os 0x745c0000)
+set(baseaddress_snmpapi 0x74580000)
+set(baseaddress_spoolss 0x74540000)
+set(baseaddress_usp10 0x744a0000)
+set(baseaddress_acledit 0x74470000)
+set(baseaddress_aclui 0x74420000)
+set(baseaddress_activeds 0x743f0000)
+set(baseaddress_actxprxy 0x74170000)
+set(baseaddress_advpack 0x74120000)
+set(baseaddress_amstream 0x740b0000)
+set(baseaddress_atl 0x74050000)
+set(baseaddress_atl100 0x74000000)
+set(baseaddress_atl80 0x73fb0000)
+set(baseaddress_authz 0x73f80000)
+set(baseaddress_avifil32 0x73f00000)
+set(baseaddress_batt 0x73ec0000)
+set(baseaddress_bcrypt 0x73e80000)
+set(baseaddress_beepmidi 0x73e50000)
+set(baseaddress_browseui 0x73d10000)
+set(baseaddress_cards 0x73c40000)
+set(baseaddress_cfgmgr32 0x73c10000)
+set(baseaddress_clusapi 0x73bd0000)
+set(baseaddress_comcat 0x73ba0000)
+set(baseaddress_compstui 0x73b70000)
+set(baseaddress_console 0x73ae0000)
+set(baseaddress_credui 0x73a90000)
+set(baseaddress_crtdll 0x73a10000)
+set(baseaddress_cryptdlg 0x739d0000)
+set(baseaddress_cryptdll 0x739a0000)
+set(baseaddress_cryptnet 0x73960000)
+set(baseaddress_d3d8 0x738e0000)
+set(baseaddress_d3d8thk 0x738c0000)
+set(baseaddress_d3d9 0x73830000)
+set(baseaddress_d3dcompiler_43 0x73750000)
+set(baseaddress_d3drm 0x736a0000)
+set(baseaddress_d3dx9_24 0x73670000)
+set(baseaddress_d3dx9_25 0x73640000)
+set(baseaddress_d3dx9_26 0x73610000)
+set(baseaddress_d3dx9_27 0x735e0000)
+set(baseaddress_d3dx9_28 0x735b0000)
+set(baseaddress_d3dx9_29 0x73580000)
+set(baseaddress_d3dx9_30 0x73550000)
+set(baseaddress_d3dx9_31 0x73520000)
+set(baseaddress_d3dx9_32 0x734f0000)
+set(baseaddress_d3dx9_33 0x734c0000)
+set(baseaddress_d3dx9_34 0x73490000)
+set(baseaddress_d3dx9_35 0x73460000)
+set(baseaddress_d3dx9_36 0x73330000)
+set(baseaddress_d3dx9_37 0x73300000)
+set(baseaddress_d3dx9_38 0x732d0000)
+set(baseaddress_d3dx9_39 0x732a0000)
+set(baseaddress_d3dx9_40 0x73270000)
+set(baseaddress_d3dx9_41 0x73240000)
+set(baseaddress_d3dx9_42 0x73210000)
+set(baseaddress_d3dx9_43 0x731e0000)
+set(baseaddress_d3dxof 0x73190000)
+set(baseaddress_dciman32 0x73160000)
+set(baseaddress_ddraw 0x73070000)
+set(baseaddress_deskadp 0x73030000)
+set(baseaddress_deskmon 0x72ff0000)
+set(baseaddress_devcpux 0x72fc0000)
+set(baseaddress_devenum 0x72f60000)
+set(baseaddress_dinput 0x72ee0000)
+set(baseaddress_dinput8 0x72ea0000)
+set(baseaddress_dmusic 0x72e40000)
+set(baseaddress_dplay 0x72e10000)
+set(baseaddress_dwmapi 0x72de0000)
+set(baseaddress_dxdiagn 0x72d80000)
+set(baseaddress_dxgi 0x72d30000)
+set(baseaddress_faultrep 0x72d00000)
+set(baseaddress_fltlib 0x72cd0000)
+set(baseaddress_fmifs 0x72ca0000)
+set(baseaddress_fontext 0x72c70000)
+set(baseaddress_framebuf 0x72c40000)
+set(baseaddress_framebuf_new 0x72c10000)
+set(baseaddress_framedyn 0x72bc0000)
+set(baseaddress_genincdata 0x72b90000)
+set(baseaddress_getuname 0x728b0000)
+set(baseaddress_hid 0x72880000)
+set(baseaddress_hlink 0x72830000)
+set(baseaddress_hnetcfg 0x727e0000)
+set(baseaddress_httpapi 0x727a0000)
+set(baseaddress_iccvid 0x72760000)
+set(baseaddress_ieframe 0x72660000)
+set(baseaddress_iernonce 0x72630000)
+set(baseaddress_imagehlp 0x725f0000)
+set(baseaddress_inetcomm 0x72570000)
+set(baseaddress_inetmib1 0x72530000)
+set(baseaddress_initpki 0x72500000)
+set(baseaddress_input 0x724a0000)
+set(baseaddress_inseng 0x72460000)
+set(baseaddress_iologmsg 0x72440000)
+set(baseaddress_itircl 0x72410000)
+set(baseaddress_itss 0x723b0000)
+set(baseaddress_jscript 0x72230000)
+set(baseaddress_jsproxy 0x721f0000)
+set(baseaddress_kbsdll 0x721c0000)
+set(baseaddress_kernel32_vista 0x721a0000)
+set(baseaddress_ksuser 0x72170000)
+set(baseaddress_libjpeg 0x720b0000)
+set(baseaddress_libpng 0x72010000)
+set(baseaddress_libtiff 0x71f00000)
+set(baseaddress_libxslt 0x71b80000)
+set(baseaddress_loadperf 0x71b50000)
+set(baseaddress_localspl 0x71b00000)
+set(baseaddress_localui 0x71ac0000)
+set(baseaddress_lpk 0x71a90000)
+set(baseaddress_lsasrv 0x71a10000)
+set(baseaddress_mapi32 0x719b0000)
+set(baseaddress_mciavi32 0x71960000)
+set(baseaddress_mcicda 0x71920000)
+set(baseaddress_mciqtz32 0x718d0000)
+set(baseaddress_mciseq 0x71890000)
+set(baseaddress_mciwave 0x71850000)
+set(baseaddress_mgmtapi 0x71820000)
+set(baseaddress_midimap 0x717e0000)
+set(baseaddress_mlang 0x71790000)
+set(baseaddress_mmdevapi 0x71740000)
+set(baseaddress_mmdrv 0x71710000)
+set(baseaddress_modemui 0x71690000)
+set(baseaddress_mprapi 0x71650000)
+set(baseaddress_msafd 0x71610000)
+set(baseaddress_mscat32 0x715e0000)
+set(baseaddress_mscms 0x715a0000)
+set(baseaddress_mscoree 0x71530000)
+set(baseaddress_msctf 0x714b0000)
+set(baseaddress_msdmo 0x71470000)
+set(baseaddress_msftedit 0x71440000)
+set(baseaddress_msgina 0x713b0000)
+set(baseaddress_mshtml 0x70f90000)
+set(baseaddress_msi 0x70d70000)
+set(baseaddress_msimtf 0x70d30000)
+set(baseaddress_msisip 0x70d00000)
+set(baseaddress_mspatcha 0x70cd0000)
+set(baseaddress_msports 0x70c90000)
+set(baseaddress_msrle32 0x70c50000)
+set(baseaddress_mssign32 0x70c20000)
+set(baseaddress_mssip32 0x70bf0000)
+set(baseaddress_mstask 0x70ba0000)
+set(baseaddress_msv1_0 0x70b70000)
+set(baseaddress_msvcrt20 0x70a40000)
+set(baseaddress_msvcrt40 0x70910000)
+set(baseaddress_msvidc32 0x708d0000)
+set(baseaddress_msxml 0x70890000)
+set(baseaddress_msxml2 0x70850000)
+set(baseaddress_msxml3 0x70370000)
+set(baseaddress_msxml4 0x70320000)
+set(baseaddress_msxml6 0x702d0000)
+set(baseaddress_nddeapi 0x702a0000)
+set(baseaddress_netcfgx 0x70200000)
+set(baseaddress_netevent 0x701e0000)
+set(baseaddress_netid 0x70190000)
+set(baseaddress_netshell 0x700f0000)
+set(baseaddress_newdev 0x70080000)
+set(baseaddress_notifyhook 0x70050000)
+set(baseaddress_ntdsapi 0x70010000)
+set(baseaddress_ntlanman 0x6ffe0000)
+set(baseaddress_ntmarta 0x6ffb0000)
+set(baseaddress_ntprint 0x6ff80000)
+set(baseaddress_objsel 0x6ff40000)
+set(baseaddress_odbc32 0x6fef0000)
+set(baseaddress_odbccp32 0x6feb0000)
+set(baseaddress_oleacc 0x6fe40000)
+set(baseaddress_olecli32 0x6fe00000)
+set(baseaddress_olepro32 0x6fdd0000)
+set(baseaddress_olesvr32 0x6fda0000)
+set(baseaddress_olethk32 0x6fd70000)
+set(baseaddress_pdh 0x6fd30000)
+set(baseaddress_pidgen 0x6fd00000)
+set(baseaddress_printui 0x6fcc0000)
+set(baseaddress_propsys 0x6fc70000)
+set(baseaddress_pstorec 0x6fc30000)
+set(baseaddress_qedit 0x6fbd0000)
+set(baseaddress_qmgr 0x6fb80000)
+set(baseaddress_qmgrprxy 0x6fb10000)
+set(baseaddress_quartz 0x6f910000)
+set(baseaddress_query 0x6f8e0000)
+set(baseaddress_rasadhlp 0x6f8b0000)
+set(baseaddress_rasdlg 0x6f6d0000)
+set(baseaddress_rasman 0x6f690000)
+set(baseaddress_resutils 0x6f650000)
+set(baseaddress_riched32 0x6f620000)
+set(baseaddress_rsabase 0x6f600000)
+set(baseaddress_samsrv 0x6f570000)
+set(baseaddress_sccbase 0x6f540000)
+set(baseaddress_schannel 0x6f4f0000)
+set(baseaddress_scrrun 0x6f490000)
+set(baseaddress_security 0x6f470000)
+set(baseaddress_serialui 0x6f440000)
+set(baseaddress_sfc 0x6f410000)
+set(baseaddress_shdoclc 0x6f3d0000)
+set(baseaddress_shdocvw 0x6f370000)
+set(baseaddress_shfolder 0x6f350000)
+set(baseaddress_shimgvw 0x6f310000)
+set(baseaddress_slayer 0x6f2d0000)
+set(baseaddress_slbcsp 0x6f2a0000)
+set(baseaddress_sndblst 0x6f260000)
+set(baseaddress_softpub 0x6f240000)
+set(baseaddress_srclient 0x6f210000)
+set(baseaddress_sti 0x6f1c0000)
+set(baseaddress_sxs 0x6f180000)
+set(baseaddress_syssetup 0x6f0c0000)
+set(baseaddress_t2embed 0x6f090000)
+set(baseaddress_tapi32 0x6f040000)
+set(baseaddress_tapiui 0x6efd0000)
+set(baseaddress_traffic 0x6efa0000)
+set(baseaddress_twain_32 0x6ef60000)
+set(baseaddress_uext2 0x6ef20000)
+set(baseaddress_ufat 0x6eef0000)
+set(baseaddress_ufatx 0x6eec0000)
+set(baseaddress_umpnpmgr 0x6ee80000)
+set(baseaddress_unicows 0x6ee40000)
+set(baseaddress_untfs 0x6ee20000)
+set(baseaddress_updspapi 0x6edf0000)
+set(baseaddress_url 0x6edc0000)
+set(baseaddress_vbscript 0x6ecf0000)
+set(baseaddress_vdmdbg 0x6ecc0000)
+set(baseaddress_wbemdisp 0x6ec80000)
+set(baseaddress_wbemprox 0x6ebf0000)
+set(baseaddress_windowscodecs 0x6ea60000)
+set(baseaddress_windowscodecsext 0x6ea30000)
+set(baseaddress_wined3d 0x6e790000)
+set(baseaddress_winfax 0x6e760000)
+set(baseaddress_wing32 0x6e730000)
+set(baseaddress_winhttp 0x6e6b0000)
+set(baseaddress_winscard 0x6e670000)
+set(baseaddress_winsta 0x6e630000)
+set(baseaddress_wlanapi 0x6e5f0000)
+set(baseaddress_wldap32 0x6e590000)
+set(baseaddress_wmi 0x6e570000)
+set(baseaddress_ws2_32_new 0x6e500000)
+set(baseaddress_wshirda 0x6e4d0000)
+set(baseaddress_wshtcpip 0x6e4a0000)
+set(baseaddress_wsock32 0x6e470000)
+set(baseaddress_wtsapi32 0x6e430000)
+set(baseaddress_wuapi 0x6e3e0000)
+set(baseaddress_xinput1_1 0x6e3b0000)
+set(baseaddress_xinput1_2 0x6e380000)
+set(baseaddress_xinput1_3 0x6e350000)
+set(baseaddress_xinput9_1_0 0x6e320000)
+set(baseaddress_xmllite 0x6e2d0000)
+set(baseaddress_access 0x6e240000)
+set(baseaddress_appwiz 0x6e1d0000)
+set(baseaddress_cmicpl 0x6e190000)
+set(baseaddress_desk 0x6e0e0000)
+set(baseaddress_hdwwiz 0x6e050000)
+set(baseaddress_hhctrl 0x6dfe0000)
+set(baseaddress_imaadp32.acm 0x6dfa0000)
+set(baseaddress_inetcpl 0x6df30000)
+set(baseaddress_intl 0x6dec0000)
+set(baseaddress_joy 0x6de70000)
+set(baseaddress_main 0x6ddb0000)
+set(baseaddress_mmsys 0x6dca0000)
+set(baseaddress_msacm32.drv 0x6dc60000)
+set(baseaddress_msadp32.acm 0x6dc20000)
+set(baseaddress_msg711.acm 0x6dbe0000)
+set(baseaddress_msgsm32.acm 0x6dbb0000)
+set(baseaddress_msisys 0x6db80000)
+set(baseaddress_ncpa 0x6db50000)
+set(baseaddress_odbccp32i 0x6db20000)
+set(baseaddress_powercfg 0x6dab0000)
+set(baseaddress_sysdm 0x6d9c0000)
+set(baseaddress_telephon 0x6d990000)
+set(baseaddress_timedate 0x6d930000)
+set(baseaddress_usrmgr 0x6d8d0000)
+set(baseaddress_wdmaud.drv 0x6d6f0000)
+set(baseaddress_wined3dcfg 0x6d6b0000)
+set(baseaddress_winemp3.acm 0x6d620000)
Propchange: trunk/reactos/cmake/baseaddress_dwarf.cmake
------------------------------------------------------------------------------
svn:eol-style = native