Revert "Fix vita elf vaddr and size (#78)" (#80)

This reverts commit 0a7a0ef.

Author: frangarcj

CMakeLists.txt

@@ -303,7 +303,6 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
         PATCH_COMMAND
             patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0001-vita.patch
             && patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0002-fix-broken-reloc.patch
-            && patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0003-fix-elf-vaddr.patch
         CONFIGURE_COMMAND ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
         --build=${build_native}
         --host=${toolchain_host}

patches/binutils/0001-vita.patch

@@ -1,19 +1,12 @@
 diff -Nru a/src/binutils/ld/scripttempl/elf.sc b/src/binutils/ld/scripttempl/elf.sc
---- a/src/binutils/ld/scripttempl/elf.sc
-+++ b/src/binutils/ld/scripttempl/elf.sc
-@@ -579,7 +579,25 @@
-   ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+. = ${DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}}
-   ${CREATE_SHLIB+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}
-   ${CREATE_PIE+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}
--
-+  /* SCE self module info size */
-+  . = . + 0x5C;
-+  /* SCE self module_proc_param size */
-+  . = . + 0x34;
-+  /* SCE self info rsvd size(import table, etc...) */
-+  . = . + 0x7000;
+--- a/src/binutils/ld/scripttempl/elf.sc	2018-07-11 17:43:55.000000000 +0200
++++ b/src/binutils/ld/scripttempl/elf.sc	2018-12-29 19:53:29.747662203 +0100
+@@ -580,6 +580,8 @@
+   ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}
+   ${CREATE_PIE+${RELOCATING+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}
+ 
 +  /* Hacky hackity hack. Need this because otherwise data segment is not aligned enough. */
-+  . = ALIGN(0x8000);
++  . = ALIGN(0x10000);
    /* Exception handling  */
    .eh_frame     ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.eh_frame)) ${RELOCATING+*(.eh_frame.*)} }
    .gnu_extab    ${RELOCATING-0} : ONLY_IF_RW { *(.gnu_extab) }