Remove brk special handling

Reverts arsv/riscv-qemu@6268f398; this should fix the observed segfaults
on statically linked binaries with the new linker script.

linux-user/elfload.c

@@ -1980,6 +1980,9 @@ static void load_elf_image(const char *image_name, int image_fd,
                 if (vaddr_ef > info->end_data) {
                     info->end_data = vaddr_ef;
                 }
+                if (vaddr_em > info->brk) {
+                    info->brk = vaddr_em;
+                }
             }
         } else if (eppnt->p_type == PT_INTERP && pinterp_name) {
             char *interp_name;
@@ -2014,12 +2017,9 @@ static void load_elf_image(const char *image_name, int image_fd,
     if (info->end_data == 0) {
         info->start_data = info->end_code;
         info->end_data = info->end_code;
+        info->brk = info->end_code;
     }
 
-    /* Heap should be located past both .text and .data */
-    info->brk = (info->end_code > info->end_data ?
-            info->end_code : info->end_data);
-
     if (qemu_log_enabled()) {
         load_symbols(ehdr, image_fd, load_bias);
     }