From 64492fe29cf77034f6cc99760aba73b2b833d160 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Sat, 21 May 2016 08:49:59 -0700 Subject: [PATCH] Add Wii U support. --- README.TXT | 2 +- dkppc/crtls/wup.ld | 257 ++++++++++++++++++++++++++++++++++ dkppc/patches/gcc-5.3.0.patch | 52 +++++-- dkppc/patches/gcc-6.1.0.patch | 52 +++++-- dkppc/rules/wiiu_rules | 12 ++ 5 files changed, 344 insertions(+), 31 deletions(-) create mode 100644 dkppc/crtls/wup.ld create mode 100644 dkppc/rules/wiiu_rules diff --git a/README.TXT b/README.TXT index 78f87ea..8d57b86 100644 --- a/README.TXT +++ b/README.TXT @@ -83,7 +83,7 @@ Using devkitPPC to use the built in crt0 and linkscript use powerpc-eabi-gcc to link your project, using the command line switch -mgcn for a bare bones system, -mogc to use libogc and -the multi-threaded microkernel for gamecube, -mrvl for wii. +the multi-threaded microkernel for gamecube, -mrvl for wii, -mwup for wii u. Using devkitPSP --------------- diff --git a/dkppc/crtls/wup.ld b/dkppc/crtls/wup.ld new file mode 100644 index 0000000..714882a --- /dev/null +++ b/dkppc/crtls/wup.ld @@ -0,0 +1,257 @@ +/* + * Linkscript for Wii U + */ + +OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc"); +OUTPUT_ARCH(powerpc:common); +EXTERN(_start); +ENTRY(_start); + +PHDRS +{ + stub PT_LOAD FLAGS(5); + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); + bss1 PT_LOAD; + bss2 PT_LOAD; +} + +SECTIONS +{ + /* default base address */ + /* use -Wl,--section-start,.init=0xADDRESS to change */ + . = 0x00802000; + + /* Program */ + .init : + { + KEEP (*crt0.o(*.init)) + KEEP (*(.init)) + } :text = 0 + .plt : { *(.plt) } + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rel.init : { *(.rel.init) } + .rela.init : { *(.rela.init) } + .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } + .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } + .rel.fini : { *(.rel.fini) } + .rela.fini : { *(.rela.fini) } + .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } + .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } + .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } + .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } + .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } + .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } + .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } + .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rela.got1 : { *(.rela.got1) } + .rela.got2 : { *(.rela.got2) } + .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } + .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } + .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } + .rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) } + .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } + .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } + .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } + .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } + .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } + .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + + .text : + { + *(.text) + *(.text.*) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t.*) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } = 0 + + .fini : + { + KEEP (*(.fini)) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } = 0 + + PROVIDE (__etext = .); + PROVIDE (_etext = .); + PROVIDE (etext = .); + + .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) } + .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + /* Ensure the __preinit_array_start label is properly aligned. We + could instead move the label definition inside the section, but + the linker would then create the section even if it turns out to + be empty, which isn't pretty. */ + . = ALIGN(32 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end = .); + PROVIDE (__init_array_start = .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end = .); + PROVIDE (__fini_array_start = .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end = .); + .data : + { + *(.data) + *(.data.*) + *(.gnu.linkonce.d.*) + SORT(CONSTRUCTORS) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } + + .data1 : { *(.data1) } + .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } + .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + .eh_frame : { KEEP (*(.eh_frame)) } + .gcc_except_table : { *(.gcc_except_table) } + .fixup : { *(.fixup) } + .got1 : { *(.got1) } + .got2 : { *(.got2) } + .dynamic : { *(.dynamic) } + + .ctors : + { + /* gcc uses crtbegin.o to find the start of + the constructors, so we make sure it is + first. Because this is a wildcard, it + doesn't matter if the user does not + actually link against crtbegin.o; the + linker won't look for a file to match a + wildcard. The wildcard also means that it + doesn't matter which directory crtbegin.o + is in. */ + + KEEP (*crtbegin.o(.ctors)) + + /* We don't want to include the .ctor section from + from the crtend.o file until after the sorted ctors. + The .ctor section from the crtend file contains the + end of ctors marker and it must be last */ + + KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } + + .dtors : + { + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } + + .jcr : { KEEP (*(.jcr)) } + .got : { *(.got.plt) *(.got) } + + + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + + .sdata : + { + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + } + + _edata = .; + PROVIDE (edata = .); + + .sbss : + { + __sbss_start = .; + PROVIDE (__sbss_start = .); + PROVIDE (___sbss_start = .); + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.sb.*) + *(.scommon) + PROVIDE (__sbss_end = .); + PROVIDE (___sbss_end = .); + . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ + __sbss_end = .; + } :bss1 + + .bss : + { + __bss_start = .; + PROVIDE (__bss_start = .); + *(.dynbss) + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + /* Align here to ensure that the .bss section occupies space up to + _end. Align after .bss to ensure correct alignment even if the + .bss section disappears because there are no input sections. */ + + . = ALIGN(32); + + PROVIDE (__bss_end = .); + __bss_end = .; + } :bss2 + + _end = .; + PROVIDE(end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} diff --git a/dkppc/patches/gcc-5.3.0.patch b/dkppc/patches/gcc-5.3.0.patch index ae99a39..0bfc6a5 100644 --- a/dkppc/patches/gcc-5.3.0.patch +++ b/dkppc/patches/gcc-5.3.0.patch @@ -35,7 +35,7 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/rs6000.h gcc-5.3.0-ppc/gcc/config/rs6000 diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/sysv4.h --- gcc-5.3.0/gcc/config/rs6000/sysv4.h 2015-09-24 14:46:45.000000000 +0100 +++ gcc-5.3.0-ppc/gcc/config/rs6000/sysv4.h 2016-03-01 08:53:23.000000000 +0000 -@@ -556,7 +556,11 @@ +@@ -556,7 +556,12 @@ /* Default starting address if specified. */ #define LINK_START_SPEC "\ @@ -44,21 +44,23 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/ + mvgc : %(link_start_vgc) ; \ + mgcbios : %(link_start_gcb) ; \ + mrvl : %(link_start_rvl) ; \ ++ mwup : %(link_start_wup) ; \ + mads : %(link_start_ads) ; \ myellowknife : %(link_start_yellowknife) ; \ mmvme : %(link_start_mvme) ; \ msim : %(link_start_sim) ; \ -@@ -585,7 +589,8 @@ +@@ -585,7 +589,9 @@ /* Any specific OS flags. */ #define LINK_OS_SPEC "\ -%{mads : %(link_os_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(link_os_ogc) ; \ ++ mwup : %(link_os_wup) ; \ + mads : %(link_os_ads) ; \ myellowknife : %(link_os_yellowknife) ; \ mmvme : %(link_os_mvme) ; \ msim : %(link_os_sim) ; \ -@@ -603,7 +608,10 @@ +@@ -603,7 +608,11 @@ /* Override rs6000.h definition. */ #undef CPP_SPEC #define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \ @@ -66,11 +68,12 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/ +%{mgcn : %(cpp_os_gcn) ; \ + mogc|mvgc|mgcbios : %(cpp_os_ogc) ; \ + mrvl : %(cpp_os_rvl) ; \ ++ mwup : %(cpp_os_wup) ; \ + mads : %(cpp_os_ads) ; \ myellowknife : %(cpp_os_yellowknife) ; \ mmvme : %(cpp_os_mvme) ; \ msim : %(cpp_os_sim) ; \ -@@ -617,7 +625,10 @@ +@@ -617,7 +625,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -78,11 +81,12 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/ +%{mgcn : %(startfile_gcn) ; \ + mogc|mvgc|mgcbios : %(startfile_ogc) ; \ + mrvl : %(startfile_ogc) ; \ ++ mwup : %(startfile_wup) ; \ + mads : %(startfile_ads) ; \ myellowknife : %(startfile_yellowknife) ; \ mmvme : %(startfile_mvme) ; \ msim : %(startfile_sim) ; \ -@@ -627,11 +638,12 @@ +@@ -627,11 +638,13 @@ mcall-openbsd: %(startfile_openbsd) ; \ : %(startfile_default) }" @@ -93,11 +97,12 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/ #define LIB_SPEC "\ -%{mads : %(lib_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(lib_ogc) ; \ -+ smads : %(lib_ads) ; \ ++ mwup : %(lib_wup) ; \ ++ mads : %(lib_ads) ; \ myellowknife : %(lib_yellowknife) ; \ mmvme : %(lib_mvme) ; \ msim : %(lib_sim) ; \ -@@ -641,11 +653,12 @@ +@@ -641,11 +653,13 @@ mcall-openbsd: %(lib_openbsd) ; \ : %(lib_default) }" @@ -108,96 +113,109 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.h gcc-5.3.0-ppc/gcc/config/rs6000/ #define ENDFILE_SPEC "\ -%{mads : %(endfile_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(endfile_ogc) ; \ ++ mwup : %(endfile_wup) ; \ + mads : %(endfile_ads) ; \ myellowknife : %(endfile_yellowknife) ; \ mmvme : %(endfile_mvme) ; \ msim : %(endfile_sim) ; \ -@@ -661,16 +674,27 @@ +@@ -661,16 +674,33 @@ /* Motorola ADS support. */ #define LIB_ADS_SPEC "--start-group -lads -lc --end-group" +#define LIB_OGC_SPEC "--start-group -lsysbase -lc --end-group" ++#define LIB_WUP_SPEC "--start-group -lsysbase -lc --end-group" #define STARTFILE_ADS_SPEC "ecrti.o%s crt0.o%s crtbegin.o%s" +#define STARTFILE_OGC_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s" ++#define STARTFILE_WUP_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s" #define ENDFILE_ADS_SPEC "crtend.o%s ecrtn.o%s" +#define ENDFILE_OGC_SPEC "crtend.o%s ecrtn.o%s" ++#define ENDFILE_WUP_SPEC "crtend.o%s ecrtn.o%s" #define LINK_START_ADS_SPEC "-T ads.ld%s" +#define LINK_START_OGC_SPEC "-T ogc.ld%s" +#define LINK_START_RVL_SPEC "-T rvl.ld%s" ++#define LINK_START_WUP_SPEC "-T wup.ld%s" +#define LINK_START_VGC_SPEC "-T vgcogc.ld%s" +#define LINK_START_GCB_SPEC "-T gcbogc.ld%s" #define LINK_OS_ADS_SPEC "" +#define LINK_OS_OGC_SPEC "--gc-sections" ++#define LINK_OS_WUP_SPEC "--gc-sections" #define CPP_OS_ADS_SPEC "" +#define CPP_OS_GCN_SPEC "-D__gamecube__ -ffunction-sections -fdata-sections" +#define CPP_OS_OGC_SPEC "-D__gamecube__ -DHW_DOL -ffunction-sections -fdata-sections" +#define CPP_OS_RVL_SPEC "-D__wii__ -DHW_RVL -ffunction-sections -fdata-sections" ++#define CPP_OS_WUP_SPEC "-D__wiiu__ -DHW_WUP -ffunction-sections -fdata-sections" /* Motorola Yellowknife support. */ #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group" -@@ -840,6 +864,7 @@ +@@ -840,6 +864,8 @@ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \ + { "lib_ogc", LIB_OGC_SPEC }, \ ++ { "lib_wup", LIB_WUP_SPEC }, \ { "lib_ads", LIB_ADS_SPEC }, \ { "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \ { "lib_mvme", LIB_MVME_SPEC }, \ -@@ -849,6 +874,7 @@ +@@ -849,6 +874,8 @@ { "lib_netbsd", LIB_NETBSD_SPEC }, \ { "lib_openbsd", LIB_OPENBSD_SPEC }, \ { "lib_default", LIB_DEFAULT_SPEC }, \ + { "startfile_ogc", STARTFILE_OGC_SPEC }, \ ++ { "startfile_wup", STARTFILE_WUP_SPEC }, \ { "startfile_ads", STARTFILE_ADS_SPEC }, \ { "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \ { "startfile_mvme", STARTFILE_MVME_SPEC }, \ -@@ -858,6 +884,7 @@ +@@ -858,6 +884,8 @@ { "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \ { "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \ { "startfile_default", STARTFILE_DEFAULT_SPEC }, \ + { "endfile_ogc", ENDFILE_OGC_SPEC }, \ ++ { "endfile_wup", ENDFILE_WUP_SPEC }, \ { "endfile_ads", ENDFILE_ADS_SPEC }, \ { "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \ { "endfile_mvme", ENDFILE_MVME_SPEC }, \ -@@ -869,7 +896,11 @@ +@@ -869,7 +896,12 @@ { "endfile_default", ENDFILE_DEFAULT_SPEC }, \ { "link_shlib", LINK_SHLIB_SPEC }, \ { "link_start", LINK_START_SPEC }, \ + { "link_start_vgc", LINK_START_VGC_SPEC }, \ + { "link_start_gcb", LINK_START_GCB_SPEC }, \ + { "link_start_rvl", LINK_START_RVL_SPEC }, \ ++ { "link_start_wup", LINK_START_WUP_SPEC }, \ { "link_start_ads", LINK_START_ADS_SPEC }, \ + { "link_start_ogc", LINK_START_OGC_SPEC }, \ { "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \ { "link_start_mvme", LINK_START_MVME_SPEC }, \ { "link_start_sim", LINK_START_SIM_SPEC }, \ -@@ -879,6 +910,7 @@ +@@ -879,6 +910,8 @@ { "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \ { "link_start_default", LINK_START_DEFAULT_SPEC }, \ { "link_os", LINK_OS_SPEC }, \ + { "link_os_ogc", LINK_OS_OGC_SPEC }, \ ++ { "link_os_wup", LINK_OS_WUP_SPEC }, \ { "link_os_ads", LINK_OS_ADS_SPEC }, \ { "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \ { "link_os_mvme", LINK_OS_MVME_SPEC }, \ -@@ -889,6 +921,9 @@ +@@ -889,6 +921,10 @@ { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_gcn", CPP_OS_GCN_SPEC }, \ + { "cpp_os_ogc", CPP_OS_OGC_SPEC }, \ + { "cpp_os_rvl", CPP_OS_RVL_SPEC }, \ ++ { "cpp_os_wup", CPP_OS_WUP_SPEC }, \ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.opt gcc-5.3.0-ppc/gcc/config/rs6000/sysv4.opt --- gcc-5.3.0/gcc/config/rs6000/sysv4.opt 2015-01-05 12:33:28.000000000 +0000 +++ gcc-5.3.0-ppc/gcc/config/rs6000/sysv4.opt 2016-03-01 08:53:23.000000000 +0000 -@@ -120,6 +120,26 @@ +@@ -120,6 +120,30 @@ Target RejectNegative Link with libads.a, libc.a and crt0.o @@ -220,6 +238,10 @@ diff -NBaur gcc-5.3.0/gcc/config/rs6000/sysv4.opt gcc-5.3.0-ppc/gcc/config/rs600 +mrvl +Target RejectNegative +Link with libsysbase.a and libc.a, use rvl linker script ++ ++mwup ++Target RejectNegative ++Link with libsysbase.a and libc.a, use wup linker script + myellowknife Target RejectNegative diff --git a/dkppc/patches/gcc-6.1.0.patch b/dkppc/patches/gcc-6.1.0.patch index fc3d928..8a24aff 100644 --- a/dkppc/patches/gcc-6.1.0.patch +++ b/dkppc/patches/gcc-6.1.0.patch @@ -21,7 +21,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/rs6000.h gcc-6.1.0-ppc/gcc/config/rs6000 diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.h --- gcc-6.1.0/gcc/config/rs6000/sysv4.h 2016-01-04 14:30:50.000000000 +0000 +++ gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.h 2016-05-20 12:12:27.073019640 +0100 -@@ -559,7 +559,11 @@ +@@ -559,7 +559,12 @@ /* Default starting address if specified. */ #define LINK_START_SPEC "\ @@ -30,21 +30,23 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ + mvgc : %(link_start_vgc) ; \ + mgcbios : %(link_start_gcb) ; \ + mrvl : %(link_start_rvl) ; \ ++ mwup : %(link_start_wup) ; \ + mads : %(link_start_ads) ; \ myellowknife : %(link_start_yellowknife) ; \ mmvme : %(link_start_mvme) ; \ msim : %(link_start_sim) ; \ -@@ -590,7 +594,8 @@ +@@ -590,7 +594,9 @@ /* Any specific OS flags. */ #define LINK_OS_SPEC "\ -%{mads : %(link_os_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(link_os_ogc) ; \ ++ mwup : %(link_os_wup) ; \ + mads : %(link_os_ads) ; \ myellowknife : %(link_os_yellowknife) ; \ mmvme : %(link_os_mvme) ; \ msim : %(link_os_sim) ; \ -@@ -608,7 +613,10 @@ +@@ -608,7 +613,11 @@ /* Override rs6000.h definition. */ #undef CPP_SPEC #define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \ @@ -52,11 +54,12 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ +%{mgcn : %(cpp_os_gcn) ; \ + mogc|mvgc|mgcbios : %(cpp_os_ogc) ; \ + mrvl : %(cpp_os_rvl) ; \ ++ mwup : %(cpp_os_wup) ; \ + mads : %(cpp_os_ads) ; \ myellowknife : %(cpp_os_yellowknife) ; \ mmvme : %(cpp_os_mvme) ; \ msim : %(cpp_os_sim) ; \ -@@ -622,7 +630,10 @@ +@@ -622,7 +630,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -64,11 +67,12 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ +%{mgcn : %(startfile_gcn) ; \ + mogc|mvgc|mgcbios : %(startfile_ogc) ; \ + mrvl : %(startfile_ogc) ; \ ++ mwup : %(startfile_wup) ; \ + mads : %(startfile_ads) ; \ myellowknife : %(startfile_yellowknife) ; \ mmvme : %(startfile_mvme) ; \ msim : %(startfile_sim) ; \ -@@ -632,11 +643,12 @@ +@@ -632,11 +643,13 @@ mcall-openbsd: %(startfile_openbsd) ; \ : %(startfile_default) }" @@ -79,11 +83,12 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ #define LIB_SPEC "\ -%{mads : %(lib_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(lib_ogc) ; \ -+ smads : %(lib_ads) ; \ ++ mwup : %(lib_wup) ; \ ++ mads : %(lib_ads) ; \ myellowknife : %(lib_yellowknife) ; \ mmvme : %(lib_mvme) ; \ msim : %(lib_sim) ; \ -@@ -646,11 +658,12 @@ +@@ -646,11 +658,13 @@ mcall-openbsd: %(lib_openbsd) ; \ : %(lib_default) }" @@ -94,96 +99,109 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ #define ENDFILE_SPEC "\ -%{mads : %(endfile_ads) ; \ +%{mgcn|mogc|mvgc|mgcbios|mrvl : %(endfile_ogc) ; \ ++ mwup : %(endfile_wup) ; \ + mads : %(endfile_ads) ; \ myellowknife : %(endfile_yellowknife) ; \ mmvme : %(endfile_mvme) ; \ msim : %(endfile_sim) ; \ -@@ -666,16 +679,27 @@ +@@ -666,16 +679,33 @@ /* Motorola ADS support. */ #define LIB_ADS_SPEC "--start-group -lads -lc --end-group" +#define LIB_OGC_SPEC "--start-group -lsysbase -lc --end-group" ++#define LIB_WUP_SPEC "--start-group -lsysbase -lc --end-group" #define STARTFILE_ADS_SPEC "ecrti.o%s crt0.o%s crtbegin.o%s" +#define STARTFILE_OGC_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s" ++#define STARTFILE_WUP_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s" #define ENDFILE_ADS_SPEC "crtend.o%s ecrtn.o%s" +#define ENDFILE_OGC_SPEC "crtend.o%s ecrtn.o%s" ++#define ENDFILE_WUP_SPEC "crtend.o%s ecrtn.o%s" #define LINK_START_ADS_SPEC "-T ads.ld%s" +#define LINK_START_OGC_SPEC "-T ogc.ld%s" +#define LINK_START_RVL_SPEC "-T rvl.ld%s" ++#define LINK_START_WUP_SPEC "-T wup.ld%s" +#define LINK_START_VGC_SPEC "-T vgcogc.ld%s" +#define LINK_START_GCB_SPEC "-T gcbogc.ld%s" #define LINK_OS_ADS_SPEC "" +#define LINK_OS_OGC_SPEC "--gc-sections" ++#define LINK_OS_WUP_SPEC "--gc-sections" #define CPP_OS_ADS_SPEC "" +#define CPP_OS_GCN_SPEC "-D__gamecube__ -ffunction-sections -fdata-sections" +#define CPP_OS_OGC_SPEC "-D__gamecube__ -DHW_DOL -ffunction-sections -fdata-sections" +#define CPP_OS_RVL_SPEC "-D__wii__ -DHW_RVL -ffunction-sections -fdata-sections" ++#define CPP_OS_WUP_SPEC "-D__wiiu__ -DHW_WUP -ffunction-sections -fdata-sections" /* Motorola Yellowknife support. */ #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group" -@@ -855,6 +879,7 @@ +@@ -855,6 +879,8 @@ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \ + { "lib_ogc", LIB_OGC_SPEC }, \ ++ { "lib_wup", LIB_WUP_SPEC }, \ { "lib_ads", LIB_ADS_SPEC }, \ { "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \ { "lib_mvme", LIB_MVME_SPEC }, \ -@@ -864,6 +889,7 @@ +@@ -864,6 +889,8 @@ { "lib_netbsd", LIB_NETBSD_SPEC }, \ { "lib_openbsd", LIB_OPENBSD_SPEC }, \ { "lib_default", LIB_DEFAULT_SPEC }, \ + { "startfile_ogc", STARTFILE_OGC_SPEC }, \ ++ { "startfile_wup", STARTFILE_WUP_SPEC }, \ { "startfile_ads", STARTFILE_ADS_SPEC }, \ { "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \ { "startfile_mvme", STARTFILE_MVME_SPEC }, \ -@@ -873,6 +899,7 @@ +@@ -873,6 +899,8 @@ { "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \ { "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \ { "startfile_default", STARTFILE_DEFAULT_SPEC }, \ + { "endfile_ogc", ENDFILE_OGC_SPEC }, \ ++ { "endfile_wup", ENDFILE_WUP_SPEC }, \ { "endfile_ads", ENDFILE_ADS_SPEC }, \ { "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \ { "endfile_mvme", ENDFILE_MVME_SPEC }, \ -@@ -884,7 +911,11 @@ +@@ -884,7 +911,12 @@ { "endfile_default", ENDFILE_DEFAULT_SPEC }, \ { "link_shlib", LINK_SHLIB_SPEC }, \ { "link_start", LINK_START_SPEC }, \ + { "link_start_vgc", LINK_START_VGC_SPEC }, \ + { "link_start_gcb", LINK_START_GCB_SPEC }, \ + { "link_start_rvl", LINK_START_RVL_SPEC }, \ ++ { "link_start_wup", LINK_START_WUP_SPEC }, \ { "link_start_ads", LINK_START_ADS_SPEC }, \ + { "link_start_ogc", LINK_START_OGC_SPEC }, \ { "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \ { "link_start_mvme", LINK_START_MVME_SPEC }, \ { "link_start_sim", LINK_START_SIM_SPEC }, \ -@@ -894,6 +925,7 @@ +@@ -894,6 +925,8 @@ { "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \ { "link_start_default", LINK_START_DEFAULT_SPEC }, \ { "link_os", LINK_OS_SPEC }, \ + { "link_os_ogc", LINK_OS_OGC_SPEC }, \ ++ { "link_os_wup", LINK_OS_WUP_SPEC }, \ { "link_os_ads", LINK_OS_ADS_SPEC }, \ { "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \ { "link_os_mvme", LINK_OS_MVME_SPEC }, \ -@@ -905,6 +937,9 @@ +@@ -905,6 +937,10 @@ { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ { "link_secure_plt", LINK_SECURE_PLT_SPEC }, \ + { "cpp_os_gcn", CPP_OS_GCN_SPEC }, \ + { "cpp_os_ogc", CPP_OS_OGC_SPEC }, \ + { "cpp_os_rvl", CPP_OS_RVL_SPEC }, \ ++ { "cpp_os_wup", CPP_OS_WUP_SPEC }, \ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.opt gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.opt --- gcc-6.1.0/gcc/config/rs6000/sysv4.opt 2016-01-04 14:30:50.000000000 +0000 +++ gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.opt 2016-05-20 12:10:24.649019640 +0100 -@@ -120,6 +120,26 @@ +@@ -120,6 +120,30 @@ Target RejectNegative Link with libads.a, libc.a and crt0.o. @@ -206,6 +224,10 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.opt gcc-6.1.0-ppc/gcc/config/rs600 +mrvl +Target RejectNegative +Link with libsysbase.a and libc.a, use rvl linker script ++ ++mwup ++Target RejectNegative ++Link with libsysbase.a and libc.a, use wup linker script + myellowknife Target RejectNegative diff --git a/dkppc/rules/wiiu_rules b/dkppc/rules/wiiu_rules new file mode 100644 index 0000000..ac08e91 --- /dev/null +++ b/dkppc/rules/wiiu_rules @@ -0,0 +1,12 @@ +ifeq ($(strip $(DEVKITPPC)),) +$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=devkitPro/devkitPPC) +endif + +MACHDEP = -DESPRESSO -mwup -mcpu=750 -meabi -mhard-float + +include $(DEVKITPPC)/base_rules + +#--------------------------------------------------------------------------------- +%.elf: + @echo linking ... $(notdir $@) + @$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIBS) -o $@