SHN_ABS #3

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
cyrillos · Jun 9, 2015 · 926349d · 926349d
1 parent 4dcee86
commit 926349d
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/pie/piegen/elf.c b/pie/piegen/elf.c
@@ -185,19 +185,15 @@ int handle_elf(const piegen_opt_t *opts, void *mem, size_t size)
 				continue;
 			if ((sym->st_shndx && sym->st_shndx < hdr->e_shnum) ||
 			    sym->st_shndx == SHN_ABS) {
-				if (sym->st_shndx == SHN_ABS)
+				if (sym->st_shndx == SHN_ABS) {
 					sh_src = NULL;
-				else {
+				} else {
 					sh_src = sec_hdrs[sym->st_shndx];
 					ptr_func_exit(sh_src);
 				}
-#if 0
-				if (ELF_ST_TYPE(sym->st_info) == STT_FUNC ||
-				    ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
-#endif
-					pr_out("#define %s%s 0x%lx\n",
-					       opts->prefix_name, name,
-					       (unsigned long)(sym->st_value + sh_src ? sh_src->sh_addr : 0));
+				pr_out("#define %s%s 0x%lx\n",
+				       opts->prefix_name, name,
+				       (unsigned long)(sym->st_value + (sh_src ? sh_src->sh_addr : 0)));
 			}
 		}
 	}