summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-04-22 01:45:14 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-04-22 01:45:14 +0200
commit45e1c359c23b3fb1ba419aac9fb7450d0cdbcd72 (patch)
tree23297d569ddd836edb1e7f22e1f8414d4ebd5621
parentb3ce5a3c91841e29e2fd87f89cbdfda4cc843c39 (diff)
exec: Fix else branch
which happened to have no nefarious consequences by luck. * exec/exec.c (load_section): Add braces around commented code to fix else branch.
-rw-r--r--exec/exec.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/exec/exec.c b/exec/exec.c
index cf90a08a..ccf7bb36 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -80,27 +80,29 @@ load_section (void *section, struct execdata *u)
if (! anywhere)
addr += u->info.elf.loadbase;
else
+ {
#if 0
- /* XXX: gnumach currently does not support high bits set in mask to prevent
- * loading at high addresses.
- * Instead, in rtld we prevent mappings there through a huge mapping done by
- * fmh().
- */
- switch (elf_machine)
- {
- case EM_386:
- case EM_486:
- /* On the i386, programs normally load at 0x08000000, and
- expect their data segment to be able to grow dynamically
- upward from its start near that address. We need to make
- sure that the dynamic linker is not mapped in a conflicting
- address. */
- /* mask = 0xf8000000UL; */ /* XXX */
- break;
- default:
- break;
- }
+ /* XXX: gnumach currently does not support high bits set in mask to prevent
+ * loading at high addresses.
+ * Instead, in rtld we prevent mappings there through a huge mapping done by
+ * fmh().
+ */
+ switch (elf_machine)
+ {
+ case EM_386:
+ case EM_486:
+ /* On the i386, programs normally load at 0x08000000, and
+ expect their data segment to be able to grow dynamically
+ upward from its start near that address. We need to make
+ sure that the dynamic linker is not mapped in a conflicting
+ address. */
+ /* mask = 0xf8000000UL; */ /* XXX */
+ break;
+ default:
+ break;
+ }
#endif
+ }
if (anywhere && addr < vm_page_size)
addr = vm_page_size;