mirror of
https://github.com/wiiu-env/WiiUPluginSystem.git
synced 2024-06-29 06:46:07 +02:00
Update the WUPS linker script and Makefile. The building step now will be simplified. Now WUPS is using binaries linked with the "-q" flag instead of real relocateables.
THIS BREAKS ALL CURRENT PLUGIN AND THE LOADER.
This commit is contained in:
Maschell
parent
0dc08b804b
commit
f3e0eaa176
3
Makefile
3
Makefile
|
|
@ -111,13 +111,12 @@ WUPSDIR := $(DEVKITPRO)/wups
|
|||
|
||||
# Rule to install wups.
|
||||
PHONY += install
|
||||
install : wups.ld wups_elf.ld
|
||||
install : wups.ld
|
||||
$(addprefix $Qrm -rf ,$(wildcard $(WUPSDIR)))
|
||||
$Qmkdir $(WUPSDIR)
|
||||
$Qmkdir $(WUPSDIR)/lib/
|
||||
$Qcp -r wups_include $(WUPSDIR)/include
|
||||
$Qcp -r wups.ld $(WUPSDIR)
|
||||
$Qcp -r wups_elf.ld $(WUPSDIR)
|
||||
$Qcp -r plugin_makefile.mk $(WUPSDIR)
|
||||
@cp $(BUILD)/lib/libwups.a $(WUPSDIR)/lib/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,9 @@
|
|||
ASFLAGS := -mregnames
|
||||
|
||||
# --relocatable: make sure ld doesn't remove relocations wups will need
|
||||
# -s: strip local symbols to speed linking
|
||||
# -u: keep certain sections
|
||||
# -T: use the linker script specified
|
||||
# -wrap: wrap function
|
||||
# --gc-sections: remove unneeded symbols
|
||||
# -T: use the linker script specified (to force certain wups sections together)
|
||||
# -Map: generate a map file
|
||||
# -q: Leave relocation sections and contents in fully linked executables
|
||||
|
||||
LDFLAG_COMMON := -u wups_load -u wups_meta -u wups_hooks -T $(WUPSDIR)/wups.ld \
|
||||
-Wl,-wrap,open,-wrap,close,-wrap,write,-wrap,read,-wrap,lseek,-wrap,stat,-wrap,fstat,-wrap,opendir,-wrap,closedir,-wrap,readdir,-wrap,mkdir \
|
||||
-Wl,-Map,$(notdir $@).map,--gc-sections
|
||||
|
||||
LDFLAGS_MOD := -Wl,--relocatable
|
||||
LDFLAGS_ELF := --relocatable -s -T $(WUPSDIR)/wups_elf.ld
|
||||
LDFLAGS += -T $(WUPSDIR)/wups.ld \
|
||||
-Wl,-wrap,open,-wrap,close,-wrap,write,-wrap,read,-wrap,lseek,-wrap,stat,-wrap,fstat,-wrap,opendir,-wrap,closedir,-wrap,readdir,-wrap,mkdir \
|
||||
-Wl,-q
|
||||
117
wups.ld
117
wups.ld
|
|
@ -1,13 +1,7 @@
|
|||
OUTPUT_FORMAT("elf32-powerpc")
|
||||
OUTPUT_ARCH(powerpc:common)
|
||||
|
||||
SECTIONS {
|
||||
.wups.meta : {
|
||||
*(.wups.meta*)
|
||||
}
|
||||
.wups.load : {
|
||||
*(.wups.load*)
|
||||
}
|
||||
.wups.hooks : {
|
||||
*(.wups.hooks*)
|
||||
}
|
||||
.text : {
|
||||
*(.text*)
|
||||
}
|
||||
|
|
@ -20,13 +14,112 @@ SECTIONS {
|
|||
.rodata : {
|
||||
*(.rodata*)
|
||||
}
|
||||
.got2 : {
|
||||
*(.got2*)
|
||||
}
|
||||
.sbss : {
|
||||
*(.sbss*)
|
||||
}
|
||||
.bss : {
|
||||
*(.bss*)
|
||||
}
|
||||
.got2 : {
|
||||
*(.got2*)
|
||||
}
|
||||
.gcc_except_table : {
|
||||
*(.gcc_except_table*)
|
||||
}
|
||||
|
||||
.fimport_avm ALIGN(16) : { *(.fimport_avm) }
|
||||
.fimport_camera ALIGN(16) : { *(.fimport_camera) }
|
||||
.fimport_coreinit ALIGN(16) : { *(.fimport_coreinit) }
|
||||
.fimport_dc ALIGN(16) : { *(.fimport_dc) }
|
||||
.fimport_dmae ALIGN(16) : { *(.fimport_dmae) }
|
||||
.fimport_drmapp ALIGN(16) : { *(.fimport_drmapp) }
|
||||
.fimport_erreula ALIGN(16) : { *(.fimport_erreula) }
|
||||
.fimport_gx2 ALIGN(16) : { *(.fimport_gx2) }
|
||||
.fimport_h264 ALIGN(16) : { *(.fimport_h264) }
|
||||
.fimport_lzma920 ALIGN(16) : { *(.fimport_lzma920) }
|
||||
.fimport_mic ALIGN(16) : { *(.fimport_mic) }
|
||||
.fimport_nfc ALIGN(16) : { *(.fimport_nfc) }
|
||||
.fimport_nio_prof ALIGN(16) : { *(.fimport_nio_prof) }
|
||||
.fimport_nlibcurl ALIGN(16) : { *(.fimport_nlibcurl) }
|
||||
.fimport_nlibnss2 ALIGN(16) : { *(.fimport_nlibnss2) }
|
||||
.fimport_nlibnss ALIGN(16) : { *(.fimport_nlibnss) }
|
||||
.fimport_nn_ac ALIGN(16) : { *(.fimport_nn_ac) }
|
||||
.fimport_nn_acp ALIGN(16) : { *(.fimport_nn_acp) }
|
||||
.fimport_nn_act ALIGN(16) : { *(.fimport_nn_act) }
|
||||
.fimport_nn_aoc ALIGN(16) : { *(.fimport_nn_aoc) }
|
||||
.fimport_nn_boss ALIGN(16) : { *(.fimport_nn_boss) }
|
||||
.fimport_nn_ccr ALIGN(16) : { *(.fimport_nn_ccr) }
|
||||
.fimport_nn_cmpt ALIGN(16) : { *(.fimport_nn_cmpt) }
|
||||
.fimport_nn_dlp ALIGN(16) : { *(.fimport_nn_dlp) }
|
||||
.fimport_nn_ec ALIGN(16) : { *(.fimport_nn_ec) }
|
||||
.fimport_nn_fp ALIGN(16) : { *(.fimport_nn_fp) }
|
||||
.fimport_nn_hai ALIGN(16) : { *(.fimport_nn_hai) }
|
||||
.fimport_nn_hpad ALIGN(16) : { *(.fimport_nn_hpad) }
|
||||
.fimport_nn_idbe ALIGN(16) : { *(.fimport_nn_idbe) }
|
||||
.fimport_nn_ndm ALIGN(16) : { *(.fimport_nn_ndm) }
|
||||
.fimport_nn_nets2 ALIGN(16) : { *(.fimport_nn_nets2) }
|
||||
.fimport_nn_nfp ALIGN(16) : { *(.fimport_nn_nfp) }
|
||||
.fimport_nn_nim ALIGN(16) : { *(.fimport_nn_nim) }
|
||||
.fimport_nn_olv ALIGN(16) : { *(.fimport_nn_olv) }
|
||||
.fimport_nn_pdm ALIGN(16) : { *(.fimport_nn_pdm) }
|
||||
.fimport_nn_save ALIGN(16) : { *(.fimport_nn_save) }
|
||||
.fimport_nn_sl ALIGN(16) : { *(.fimport_nn_sl) }
|
||||
.fimport_nn_spm ALIGN(16) : { *(.fimport_nn_spm) }
|
||||
.fimport_nn_temp ALIGN(16) : { *(.fimport_nn_temp) }
|
||||
.fimport_nn_uds ALIGN(16) : { *(.fimport_nn_uds) }
|
||||
.fimport_nn_vctl ALIGN(16) : { *(.fimport_nn_vctl) }
|
||||
.fimport_nsysccr ALIGN(16) : { *(.fimport_nsysccr) }
|
||||
.fimport_nsyshid ALIGN(16) : { *(.fimport_nsyshid) }
|
||||
.fimport_nsyskbd ALIGN(16) : { *(.fimport_nsyskbd) }
|
||||
.fimport_nsysnet ALIGN(16) : { *(.fimport_nsysnet) }
|
||||
.fimport_nsysuhs ALIGN(16) : { *(.fimport_nsysuhs) }
|
||||
.fimport_nsysuvd ALIGN(16) : { *(.fimport_nsysuvd) }
|
||||
.fimport_ntag ALIGN(16) : { *(.fimport_ntag) }
|
||||
.fimport_padscore ALIGN(16) : { *(.fimport_padscore) }
|
||||
.fimport_proc_ui ALIGN(16) : { *(.fimport_proc_ui) }
|
||||
.fimport_sndcore2 ALIGN(16) : { *(.fimport_sndcore2) }
|
||||
.fimport_snd_core ALIGN(16) : { *(.fimport_snd_core) }
|
||||
.fimport_snduser2 ALIGN(16) : { *(.fimport_snduser2) }
|
||||
.fimport_snd_user ALIGN(16) : { *(.fimport_snd_user) }
|
||||
.fimport_swkbd ALIGN(16) : { *(.fimport_swkbd) }
|
||||
.fimport_sysapp ALIGN(16) : { *(.fimport_sysapp) }
|
||||
.fimport_tcl ALIGN(16) : { *(.fimport_tcl) }
|
||||
.fimport_tve ALIGN(16) : { *(.fimport_tve) }
|
||||
.fimport_uac ALIGN(16) : { *(.fimport_uac) }
|
||||
.fimport_uac_rpl ALIGN(16) : { *(.fimport_uac_rpl) }
|
||||
.fimport_usb_mic ALIGN(16) : { *(.fimport_usb_mic) }
|
||||
.fimport_uvc ALIGN(16) : { *(.fimport_uvc) }
|
||||
.fimport_uvd ALIGN(16) : { *(.fimport_uvd) }
|
||||
.fimport_vpadbase ALIGN(16) : { *(.fimport_vpadbase) }
|
||||
.fimport_vpad ALIGN(16) : { *(.fimport_vpad) }
|
||||
.fimport_zlib125 ALIGN(16) : { *(.fimport_zlib125) }
|
||||
|
||||
.dimport_coreinit ALIGN(16) : { *(.dimport_coreinit) }
|
||||
.dimport_nn_act ALIGN(16) : { *(.dimport_nn_act) }
|
||||
.dimport_nn_boss ALIGN(16) : { *(.dimport_nn_boss) }
|
||||
.dimport_nn_ec ALIGN(16) : { *(.dimport_nn_ec) }
|
||||
.dimport_nn_nim ALIGN(16) : { *(.dimport_nn_nim) }
|
||||
.dimport_nn_sl ALIGN(16) : { *(.dimport_nn_sl) }
|
||||
.dimport_nn_uds ALIGN(16) : { *(.dimport_nn_uds) }
|
||||
|
||||
.wups.meta : {
|
||||
*(.wups.meta*)
|
||||
KEEP(*(.wups.meta*))
|
||||
}
|
||||
.wups.load : {
|
||||
*(.wups.load*)
|
||||
KEEP(*(.wups.load*))
|
||||
}
|
||||
.wups.hooks : {
|
||||
*(.wups.hooks*)
|
||||
KEEP(*(.wups.hooks*))
|
||||
}
|
||||
/DISCARD/ : {
|
||||
*(.abs)
|
||||
*(.comment)
|
||||
*(.gnu.attributes)
|
||||
*(.gnu.version)
|
||||
*(.gnu.version_d)
|
||||
*(.gnu.version_r)
|
||||
}
|
||||
}
|
||||
14
wups_elf.ld
14
wups_elf.ld
|
|
@ -1,14 +0,0 @@
|
|||
SECTIONS {
|
||||
.wups.meta : {
|
||||
wups_meta = .;
|
||||
*(.wups.meta*)
|
||||
}
|
||||
.wups.load : {
|
||||
wups_load = .;
|
||||
*(.wups.load*)
|
||||
}
|
||||
.wups.hooks : {
|
||||
wups_hooks = .;
|
||||
*(.wups.hooks*)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user