diff --git a/share/rpx.specs b/share/rpx.specs deleted file mode 100644 index 9d2a1ad..0000000 --- a/share/rpx.specs +++ /dev/null @@ -1,2 +0,0 @@ -*wut_entry: ---entry=__rpx_start diff --git a/share/wut.cmake b/share/wut.cmake index 6069722..645959f 100644 --- a/share/wut.cmake +++ b/share/wut.cmake @@ -45,8 +45,7 @@ function(wut_create_rpl target source) cmake_parse_arguments(RPL "${RPL_OPTIONS}" "${RPL_SINGLE_ARGS}" "${RPL_MULTI_ARGS}" "${ARGN}") if(RPL_IS_RPX) - set_property(TARGET ${source} APPEND_STRING PROPERTY - LINK_FLAGS "-specs=${WUT_ROOT}/share/rpx.specs") + # Do nothing - the defaults are good for RPX else() set(ELF2RPL_FLAGS ${ELF2RPL_FLAGS} --rpl) set_property(TARGET ${source} APPEND_STRING PROPERTY diff --git a/share/wut.ld b/share/wut.ld index c907ee7..96ec121 100644 --- a/share/wut.ld +++ b/share/wut.ld @@ -8,7 +8,7 @@ MEMORY { loadmem (rwx) : ORIGIN = 0xC0000000, LENGTH = 128M } -ENTRY(_start) +ENTRY(__rpx_start) SECTIONS { diff --git a/share/wut.mk b/share/wut.mk index 65f0d43..62791cc 100644 --- a/share/wut.mk +++ b/share/wut.mk @@ -72,7 +72,7 @@ ifneq ($(strip $(WUT_NO_LDGROUPS)), 1) endif # RPX and RPL need slightly different crts (init code) -%.rpx: LDFLAGS += -specs=$(WUT_ROOT)/share/rpx.specs +#%.rpx: LDFLAGS += -specs=$(WUT_ROOT)/share/rpx.specs %.rpl: LDFLAGS += -specs=$(WUT_ROOT)/share/rpl.specs # ------------------------------------------------------------------------------ diff --git a/share/wut_rules b/share/wut_rules index 6e3aa48..98fb9d1 100644 --- a/share/wut_rules +++ b/share/wut_rules @@ -18,7 +18,7 @@ export PATH := $(PORTLIBS_PATH)/wiiu/bin:$(PORTLIBS_PATH)/ppc/bin:$(PATH) WUT_ROOT ?= $(DEVKITPRO)/wut -RPXSPECS := -specs=$(WUT_ROOT)/share/wut.specs -specs=$(WUT_ROOT)/share/rpx.specs +RPXSPECS := -specs=$(WUT_ROOT)/share/wut.specs RPLSPECS := -specs=$(WUT_ROOT)/share/wut.specs -specs=$(WUT_ROOT)/share/rpl.specs MACHDEP = -DESPRESSO -mcpu=750 -meabi -mhard-float