diff options
| -rw-r--r-- | backends/platform/psp/main_prog.ld | 6 | ||||
| -rw-r--r-- | backends/platform/psp/trace.cpp | 1 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/backends/platform/psp/main_prog.ld b/backends/platform/psp/main_prog.ld index b9ebf1284b..4216e7f0ab 100644 --- a/backends/platform/psp/main_prog.ld +++ b/backends/platform/psp/main_prog.ld @@ -198,11 +198,15 @@ SECTIONS __plugin_hole_start = .; . = _gp + 0x7ff0; __plugin_hole_end = .; + COMMON : + { + *(COMMON) + } + . = ALIGN(32 / 8); .bss : { *(.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. */ diff --git a/backends/platform/psp/trace.cpp b/backends/platform/psp/trace.cpp index 752c0b8306..28696c30a6 100644 --- a/backends/platform/psp/trace.cpp +++ b/backends/platform/psp/trace.cpp @@ -27,6 +27,7 @@ #include "./trace.h" + void PSPDebugTrace (const char *format, ...) { #ifdef __PSP_DEBUG__ va_list opt; @@ -1802,7 +1802,7 @@ PLUGIN_SUFFIX := .plg PLUGIN_EXTRA_DEPS = $(EXECUTABLE) CXXFLAGS += -DDYNAMIC_MODULES LDFLAGS += -Wl,-T$(srcdir)/backends/platform/psp/main_prog.ld -PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm -Wl,-Map,mapfile.txt +PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm PRE_OBJS_FLAGS := -Wl,--whole-archive POST_OBJS_FLAGS := -Wl,--no-whole-archive ' @@ -2312,7 +2312,7 @@ case $_backend in psp) DEFINES="$DEFINES -D__PSP__ -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL" INCLUDES="$INCLUDES -I$PSPDEV/psp/include/SDL" - LIBS="$LIBS -lpng -lSDL" + LIBS="$LIBS -lpng -lSDL -Wl,-Map,mapfile.txt" SDLLIBS=$($PSPDEV/psp/bin/sdl-config --libs) if `echo "$SDLLIBS" | grep ".*-lGL.*" 1>/dev/null 2>&1` |