From 012ddd154abac6f843917f983ca84d9ff6e7238c Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Fri, 12 Jun 2020 13:55:34 +0200
Subject: [PATCH] Extend wut share files instead of replacing it

---
 libraries/libwups/overlay.cpp |   3 -
 share/wups.ld                 | 463 +---------------------------------
 share/wups.specs              |   6 +-
 share/wups_rules              |  18 +-
 4 files changed, 7 insertions(+), 483 deletions(-)

diff --git a/libraries/libwups/overlay.cpp b/libraries/libwups/overlay.cpp
index 31d1115..4f6d054 100644
--- a/libraries/libwups/overlay.cpp
+++ b/libraries/libwups/overlay.cpp
@@ -1,5 +1,3 @@
-
-#define _GNU_SOURCE
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -17,7 +15,6 @@
 extern "C" {
 #endif
 
-
 void OSScreenInit(void);
 void OSScreenShutdown(void);
 uint32_t OSScreenGetBufferSizeEx(uint32_t bufferNum);
diff --git a/share/wups.ld b/share/wups.ld
index 11470d0..587d330 100644
--- a/share/wups.ld
+++ b/share/wups.ld
@@ -1,476 +1,17 @@
-OUTPUT_FORMAT("elf32-powerpc")
-OUTPUT_ARCH(powerpc:common)
-
-MEMORY {
-   relmem  (rw)  : ORIGIN = 0x00000000, LENGTH = 32M
-   codemem (rwx) : ORIGIN = 0x02000000, LENGTH = 224M
-   datamem (rw)  : ORIGIN = 0x10000000, LENGTH = 800M
-   loadmem (rwx) : ORIGIN = 0xC0000000, LENGTH = 128M
-}
-
-ENTRY(__rpx_start)
-
 SECTIONS
 {
-   . = ORIGIN(codemem);
-   .syscall ALIGN(32) : {
-      *(.syscall .syscall.*)
-   } > codemem
-
-   .text ALIGN(32) : {
-      KEEP (*crt0.o(*.init))
-      KEEP (*(.init))
-
-      *(.text)
-      *(.text.*)
-      *(.gnu.warning)
-      *(.gnu.linkonce.t.*)
-
-      KEEP (*(.fini))
-   } > codemem
-
-   . = ORIGIN(datamem);
-   .rodata : {
-      *(.rodata)
-      *(.rodata.*)
-      *(.gnu.linkonce.r.*)
-
-      *(.preinit_array)
-      *(.init_array)
-      *(.fini_array)
-
-      KEEP (*crtbegin.o(.ctors))
-      KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-      KEEP (*(SORT(.ctors.*)))
-      KEEP (*(.ctors))
-
-      KEEP (*crtbegin.o(.dtors))
-      KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-      KEEP (*(SORT(.dtors.*)))
-      KEEP (*(.dtors))
-
-      *(.jcr)
-      *(.dynamic)
-      *(.eh_frame_hdr)
-      KEEP (*(.eh_frame))
-      *(.fixup)
-      *(.gcc_except_table)
-      *(.gcc_except_table.*)
-      *(.got)
-      *(.got1)
-      *(.got2)
-      *(.got.plt)
-      *(.plt)
-      *(.tm_clone_table)
-   } > datamem
-
-   .data : {
-      *(.data)
-      *(.data.*)
-      *(.gnu.linkonce.d.*)
-      SORT(CONSTRUCTORS)
-
-      __sdata_start = .;
-      *(.sdata)
-      *(.sdata.*)
-      *(.gnu.linkonce.s.*)
-      __sdata_end = .;
-
-      __sdata2_start = .;
-      *(.sdata2)
-      *(.sdata2.*)
-      *(.gnu.linkonce.s2.*)
-      __sdata2_end = .;
-   } > datamem
-
-   __bss_start = .;
-   .bss (NOLOAD) : {
-      *(.dynbss)
-      *(.bss)
-      *(.bss.*)
-      *(.gnu.linkonce.b.*)
-      *(COMMON)
-
-      __sbss_start = .;
-      *(.dynsbss)
-      *(.sbss)
-      *(.sbss.*)
-      *(.gnu.linkonce.sb.*)
-      *(.scommon)
-      __sbss_end = .;
-
-      __sbss2_start = .;
-      *(.sbss2)
-      *(.sbss2.*)
-      *(.gnu.linkonce.sb2.*)
-      __sbss2_end = .;
-   } > datamem
-   __bss_end = .;
-
-   . = ORIGIN(relmem);
-   .rela.text ALIGN(4) : {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t.*)
-      *(.rela.init)
-      *(.rela.fini)
-   } > relmem
-   .rela.data ALIGN(4) : {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d.*)
-      *(.rela.sdata)
-      *(.rela.gnu.linkonce.s.*)
-      *(.rela.sdata2)
-      *(.rela.gnu.linkonce.s2.*)
-      *(.rela.init_array)
-      *(.rela.fini_array)
-      *(.rela.gcc_except_table .rela.gcc_except_table.*)
-      *(.rela.eh_frame)
-      *(.rela.got)
-      *(.rela.got1)
-      *(.rela.got2)
-      *(.rela.got.plt)
-      *(.rela.plt)
-   } > relmem
-   .rela.rodata ALIGN(4) : {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rel.gnu.linkonce.r.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-   } > relmem
-
-   . = ORIGIN(loadmem);
-   .fexports ALIGN(32) : { KEEP( *(.fexports) ) } > loadmem
-   .dexports ALIGN(32) : { KEEP( *(.dexports) ) } > loadmem
-
-   .fimport_avm ALIGN(16) : {
-      KEEP ( *(.fimport_avm) )
-      *(.fimport_avm.*)
-   } > loadmem
-   .fimport_camera ALIGN(16) : {
-      KEEP ( *(.fimport_camera) )
-      *(.fimport_camera.*)
-   } > loadmem
-   .fimport_coreinit ALIGN(16) : {
-      KEEP ( *(.fimport_coreinit) )
-      *(.fimport_coreinit.*)
-   } > loadmem
-   .fimport_dc ALIGN(16) : {
-      KEEP ( *(.fimport_dc) )
-      *(.fimport_dc.*)
-   } > loadmem
-   .fimport_dmae ALIGN(16) : {
-      KEEP ( *(.fimport_dmae) )
-      *(.fimport_dmae.*)
-   } > loadmem
-   .fimport_drmapp ALIGN(16) : {
-      KEEP ( *(.fimport_drmapp) )
-      *(.fimport_drmapp.*)
-   } > loadmem
-   .fimport_erreula ALIGN(16) : {
-      KEEP ( *(.fimport_erreula) )
-      *(.fimport_erreula.*)
-   } > loadmem
-   .fimport_gx2 ALIGN(16) : {
-      KEEP ( *(.fimport_gx2) )
-      *(.fimport_gx2.*)
-   } > loadmem
-   .fimport_h264 ALIGN(16) : {
-      KEEP ( *(.fimport_h264) )
-      *(.fimport_h264.*)
-   } > loadmem
-   .fimport_lzma920 ALIGN(16) : {
-      KEEP ( *(.fimport_lzma920) )
-      *(.fimport_lzma920.*)
-   } > loadmem
-   .fimport_mic ALIGN(16) : {
-      KEEP ( *(.fimport_mic) )
-      *(.fimport_mic.*)
-   } > loadmem
-   .fimport_nfc ALIGN(16) : {
-      KEEP ( *(.fimport_nfc) )
-      *(.fimport_nfc.*)
-   } > loadmem
-   .fimport_nio_prof ALIGN(16) : {
-      KEEP ( *(.fimport_nio_prof) )
-      *(.fimport_nio_prof.*)
-   } > loadmem
-   .fimport_nlibcurl ALIGN(16) : {
-      KEEP ( *(.fimport_nlibcurl) )
-      *(.fimport_nlibcurl.*)
-   } > loadmem
-   .fimport_nlibnss2 ALIGN(16) : {
-      KEEP ( *(.fimport_nlibnss2) )
-      *(.fimport_nlibnss2.*)
-   } > loadmem
-   .fimport_nlibnss ALIGN(16) : {
-      KEEP ( *(.fimport_nlibnss) )
-      *(.fimport_nlibnss.*)
-   } > loadmem
-   .fimport_nn_ac ALIGN(16) : {
-      KEEP ( *(.fimport_nn_ac) )
-      *(.fimport_nn_ac.*)
-   } > loadmem
-   .fimport_nn_acp ALIGN(16) : {
-      KEEP ( *(.fimport_nn_acp) )
-      *(.fimport_nn_acp.*)
-   } > loadmem
-   .fimport_nn_act ALIGN(16) : {
-      KEEP ( *(.fimport_nn_act) )
-      *(.fimport_nn_act.*)
-   } > loadmem
-   .fimport_nn_aoc ALIGN(16) : {
-      KEEP ( *(.fimport_nn_aoc) )
-      *(.fimport_nn_aoc.*)
-   } > loadmem
-   .fimport_nn_boss ALIGN(16) : {
-      KEEP ( *(.fimport_nn_boss) )
-      *(.fimport_nn_boss.*)
-   } > loadmem
-   .fimport_nn_ccr ALIGN(16) : {
-      KEEP ( *(.fimport_nn_ccr) )
-      *(.fimport_nn_ccr.*)
-   } > loadmem
-   .fimport_nn_cmpt ALIGN(16) : {
-      KEEP ( *(.fimport_nn_cmpt) )
-      *(.fimport_nn_cmpt.*)
-   } > loadmem
-   .fimport_nn_dlp ALIGN(16) : {
-      KEEP ( *(.fimport_nn_dlp) )
-      *(.fimport_nn_dlp.*)
-   } > loadmem
-   .fimport_nn_ec ALIGN(16) : {
-      KEEP ( *(.fimport_nn_ec) )
-      *(.fimport_nn_ec.*)
-   } > loadmem
-   .fimport_nn_fp ALIGN(16) : {
-      KEEP ( *(.fimport_nn_fp) )
-      *(.fimport_nn_fp.*)
-   } > loadmem
-   .fimport_nn_hai ALIGN(16) : {
-      KEEP ( *(.fimport_nn_hai) )
-      *(.fimport_nn_hai.*)
-   } > loadmem
-   .fimport_nn_hpad ALIGN(16) : {
-      KEEP ( *(.fimport_nn_hpad) )
-      *(.fimport_nn_hpad.*)
-   } > loadmem
-   .fimport_nn_idbe ALIGN(16) : {
-      KEEP ( *(.fimport_nn_idbe) )
-      *(.fimport_nn_idbe.*)
-   } > loadmem
-   .fimport_nn_ndm ALIGN(16) : {
-      KEEP ( *(.fimport_nn_ndm) )
-      *(.fimport_nn_ndm.*)
-   } > loadmem
-   .fimport_nn_nets2 ALIGN(16) : {
-      KEEP ( *(.fimport_nn_nets2) )
-      *(.fimport_nn_nets2.*)
-   } > loadmem
-   .fimport_nn_nfp ALIGN(16) : {
-      KEEP ( *(.fimport_nn_nfp) )
-      *(.fimport_nn_nfp.*)
-   } > loadmem
-   .fimport_nn_nim ALIGN(16) : {
-      KEEP ( *(.fimport_nn_nim) )
-      *(.fimport_nn_nim.*)
-   } > loadmem
-   .fimport_nn_olv ALIGN(16) : {
-      KEEP ( *(.fimport_nn_olv) )
-      *(.fimport_nn_olv.*)
-   } > loadmem
-   .fimport_nn_pdm ALIGN(16) : {
-      KEEP ( *(.fimport_nn_pdm) )
-      *(.fimport_nn_pdm.*)
-   } > loadmem
-   .fimport_nn_save ALIGN(16) : {
-      KEEP ( *(.fimport_nn_save) )
-      *(.fimport_nn_save.*)
-   } > loadmem
-   .fimport_nn_sl ALIGN(16) : {
-      KEEP ( *(.fimport_nn_sl) )
-      *(.fimport_nn_sl.*)
-   } > loadmem
-   .fimport_nn_spm ALIGN(16) : {
-      KEEP ( *(.fimport_nn_spm) )
-      *(.fimport_nn_spm.*)
-   } > loadmem
-   .fimport_nn_temp ALIGN(16) : {
-      KEEP ( *(.fimport_nn_temp) )
-      *(.fimport_nn_temp.*)
-   } > loadmem
-   .fimport_nn_uds ALIGN(16) : {
-      KEEP ( *(.fimport_nn_uds) )
-      *(.fimport_nn_uds.*)
-   } > loadmem
-   .fimport_nn_vctl ALIGN(16) : {
-      KEEP ( *(.fimport_nn_vctl) )
-      *(.fimport_nn_vctl.*)
-   } > loadmem
-   .fimport_nsysccr ALIGN(16) : {
-      KEEP ( *(.fimport_nsysccr) )
-      *(.fimport_nsysccr.*)
-   } > loadmem
-   .fimport_nsyshid ALIGN(16) : {
-      KEEP ( *(.fimport_nsyshid) )
-      *(.fimport_nsyshid.*)
-   } > loadmem
-   .fimport_nsyskbd ALIGN(16) : {
-      KEEP ( *(.fimport_nsyskbd) )
-      *(.fimport_nsyskbd.*)
-   } > loadmem
-   .fimport_nsysnet ALIGN(16) : {
-      KEEP ( *(.fimport_nsysnet) )
-      *(.fimport_nsysnet.*)
-   } > loadmem
-   .fimport_nsysuhs ALIGN(16) : {
-      KEEP ( *(.fimport_nsysuhs) )
-      *(.fimport_nsysuhs.*)
-   } > loadmem
-   .fimport_nsysuvd ALIGN(16) : {
-      KEEP ( *(.fimport_nsysuvd) )
-      *(.fimport_nsysuvd.*)
-   } > loadmem
-   .fimport_ntag ALIGN(16) : {
-      KEEP ( *(.fimport_ntag) )
-      *(.fimport_ntag.*)
-   } > loadmem
-   .fimport_padscore ALIGN(16) : {
-      KEEP ( *(.fimport_padscore) )
-      *(.fimport_padscore.*)
-   } > loadmem
-   .fimport_proc_ui ALIGN(16) : {
-      KEEP ( *(.fimport_proc_ui) )
-      *(.fimport_proc_ui.*)
-   } > loadmem
-   .fimport_sndcore2 ALIGN(16) : {
-      KEEP ( *(.fimport_sndcore2) )
-      *(.fimport_sndcore2.*)
-   } > loadmem
-   .fimport_snd_core ALIGN(16) : {
-      KEEP ( *(.fimport_snd_core) )
-      *(.fimport_snd_core.*)
-   } > loadmem
-   .fimport_snduser2 ALIGN(16) : {
-      KEEP ( *(.fimport_snduser2) )
-      *(.fimport_snduser2.*)
-   } > loadmem
-   .fimport_snd_user ALIGN(16) : {
-      KEEP ( *(.fimport_snd_user) )
-      *(.fimport_snd_user.*)
-   } > loadmem
-   .fimport_swkbd ALIGN(16) : {
-      KEEP ( *(.fimport_swkbd) )
-      *(.fimport_swkbd.*)
-   } > loadmem
-   .fimport_sysapp ALIGN(16) : {
-      KEEP ( *(.fimport_sysapp) )
-      *(.fimport_sysapp.*)
-   } > loadmem
-   .fimport_tcl ALIGN(16) : {
-      KEEP ( *(.fimport_tcl) )
-      *(.fimport_tcl.*)
-   } > loadmem
-   .fimport_tve ALIGN(16) : {
-      KEEP ( *(.fimport_tve) )
-      *(.fimport_tve.*)
-   } > loadmem
-   .fimport_uac ALIGN(16) : {
-      KEEP ( *(.fimport_uac) )
-      *(.fimport_uac.*)
-   } > loadmem
-   .fimport_uac_rpl ALIGN(16) : {
-      KEEP ( *(.fimport_uac_rpl) )
-      *(.fimport_uac_rpl.*)
-   } > loadmem
-   .fimport_usb_mic ALIGN(16) : {
-      KEEP ( *(.fimport_usb_mic) )
-      *(.fimport_usb_mic.*)
-   } > loadmem
-   .fimport_uvc ALIGN(16) : {
-      KEEP ( *(.fimport_uvc) )
-      *(.fimport_uvc.*)
-   } > loadmem
-   .fimport_uvd ALIGN(16) : {
-      KEEP ( *(.fimport_uvd) )
-      *(.fimport_uvd.*)
-   } > loadmem
-   .fimport_vpadbase ALIGN(16) : {
-      KEEP ( *(.fimport_vpadbase) )
-      *(.fimport_vpadbase.*)
-   } > loadmem
-   .fimport_vpad ALIGN(16) : {
-      KEEP ( *(.fimport_vpad) )
-      *(.fimport_vpad.*)
-   } > loadmem
-   .fimport_zlib125 ALIGN(16) : {
-      KEEP ( *(.fimport_zlib125) )
-      *(.fimport_zlib125.*)
-   } > loadmem
-
-   .dimport_coreinit ALIGN(16) : {
-      KEEP ( *(.dimport_coreinit) )
-      *(.dimport_coreinit.*)
-   } > loadmem
-   .dimport_nn_act ALIGN(16) : {
-      KEEP ( *(.dimport_nn_act) )
-      *(.dimport_nn_act.*)
-   } > loadmem
-   .dimport_nn_boss ALIGN(16) : {
-      KEEP ( *(.dimport_nn_boss) )
-      *(.dimport_nn_boss.*)
-   } > loadmem
-   .dimport_nn_ec ALIGN(16) : {
-      KEEP ( *(.dimport_nn_ec) )
-      *(.dimport_nn_ec.*)
-   } > loadmem
-   .dimport_nn_nim ALIGN(16) : {
-      KEEP ( *(.dimport_nn_nim) )
-      *(.dimport_nn_nim.*)
-   } > loadmem
-   .dimport_nn_sl ALIGN(16) : {
-      KEEP ( *(.dimport_nn_sl) )
-      *(.dimport_nn_sl.*)
-   } > loadmem
-   .dimport_nn_uds ALIGN(16) : {
-      KEEP ( *(.dimport_nn_uds) )
-      *(.dimport_nn_uds.*)
-   } > loadmem
-
-   .symtab ALIGN(4) : { *(.symtab) } > loadmem
-   .strtab ALIGN(1) : { *(.strtab) } > loadmem
-   .shstrtab ALIGN(1) : { *(.shstrtab) } > loadmem
-
-   __SDATA_START__ = __sdata_start;
-   __SBSS_END__ = __sbss_end;
-
-   __SDATA2_START__ = __sdata2_start;
-   __SBSS2_END__ = __sbss2_end;
-
-   _SDA_BASE_ = __sbss_end;
-   _SDA2_BASE_ = __sdata2_start + ((__sbss2_end - __sdata2_start) / 2);
-
    .wups.meta : {
 	  *(.wups.meta*)
       KEEP(*(.wups.meta*))
    } > datamem
+   
    .wups.load : {
 	  *(.wups.load*)
       KEEP(*(.wups.load*))
    } > datamem
+   
    .wups.hooks : {
 	  *(.wups.hooks*)
       KEEP(*(.wups.hooks*))
    } > datamem
-    
-   /DISCARD/ : {
-      *(.abs)
-      *(.comment)
-      *(.gnu.attributes)
-      *(.gnu.version)
-      *(.gnu.version_d)
-      *(.gnu.version_r)
-   }
 }
\ No newline at end of file
diff --git a/share/wups.specs b/share/wups.specs
index b27fa1d..73916c1 100644
--- a/share/wups.specs
+++ b/share/wups.specs
@@ -1,4 +1,2 @@
-%rename link old_link
-
-*link:
-%(old_link) -T %:getenv(DEVKITPRO /wups/share/wups.ld) --gc-sections --emit-relocs -z nocopyreloc -wrap __gxx_personality_v0 --entry=__wups_start
\ No newline at end of file
+*wut_entry:
+--entry=__wups_start
\ No newline at end of file
diff --git a/share/wups_rules b/share/wups_rules
index cc2a6ac..e7cbb01 100644
--- a/share/wups_rules
+++ b/share/wups_rules
@@ -10,17 +10,11 @@ ifeq ($(strip $(DEVKITPPC)),)
 $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>/devkitPro/devkitPPC")
 endif
 
-include $(DEVKITPPC)/base_rules
-
-PORTLIBS	:=	$(PORTLIBS_PATH)/wiiu $(PORTLIBS_PATH)/ppc
-
-export PATH := $(PORTLIBS_PATH)/wiiu/bin:$(PORTLIBS_PATH)/ppc/bin:$(PATH)
+include $(DEVKITPRO)/wut/share/wut_rules
 
 WUPS_ROOT	?=	$(DEVKITPRO)/wups
 
-WUPSSPECS	:=	-specs=$(WUPS_ROOT)/share/wups.specs
-
-MACHDEP	= -DESPRESSO -mcpu=750 -meabi -mhard-float
+WUPSSPECS	:=	-T$(WUPS_ROOT)/share/wups.ld -specs=$(WUPS_ROOT)/share/wups.specs
 
 #---------------------------------------------------------------------------------
 %.wps: %.elf
@@ -29,10 +23,4 @@ MACHDEP	= -DESPRESSO -mcpu=750 -meabi -mhard-float
 	@elf2rpl $*.strip.elf $@
 	@printf '\xDE\xAD' | dd of=$@ bs=1 seek=9 count=2 conv=notrunc status=none
 	@rm $*.strip.elf
-	@echo built ... $(notdir $@)
-    
-#---------------------------------------------------------------------------------
-%.elf:
-	@echo linking ... $(notdir $@)
-	@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
-	@$(NM) -CSn $@ > $(notdir $*.lst)
+	@echo built ... $(notdir $@)
\ No newline at end of file