Add option -e for setting ELF file's entry

Ziyao committed 4 years ago

Commit 39ea3401 parent 03669243 files · +12 −2Browse files

Unified · Split

3 files

             s->symbolic = 1;
         } else if (link_option(option, "nostdlib", &p)) {
             s->nostdlib = 1;
+        } else if (link_option(option, "e=", &p)) {
+            copy_linker_arg(&s->elf_entryname, p, 0);
         } else if (link_option(option, "fini=", &p)) {
             copy_linker_arg(&s->fini_symbol, p, 0);
             ignoring = 1;

tcc.h+2−0

@@ -961,6 +961,8 @@ struct TCCState { · 960 unmodified lines
961	Section *verneed_section;	961	Section *verneed_section;
962	#endif	962	#endif
963		963
		964	char *elf_entryname;
		965
964	#ifdef TCC_IS_NATIVE	966	#ifdef TCC_IS_NATIVE
965	const char *runtime_main;	967	const char *runtime_main;
966	void **runtime_mem;	968	void **runtime_mem;

     default:
     case TCC_OUTPUT_EXE:
         ehdr.e_type = ET_EXEC;
-        ehdr.e_entry = get_sym_addr(s1, "_start", 1, 0);
+        ehdr.e_entry = get_sym_addr(s1,
+                                    s1->elf_entryname ?
+                                        s1->elf_entryname : "_start",
+                                    1, 0);
         break;
     case TCC_OUTPUT_DLL:
         ehdr.e_type = ET_DYN;
-        ehdr.e_entry = text_section->sh_addr; /* XXX: is it correct ? */
+        ehdr.e_entry = s1->elf_entryname ?
+                            get_sym_addr(s1,s1->elf_entryname,1,0) :
+                            text_section->sh_addr;
+                            /* XXX: is it correct ? */
         break;
     case TCC_OUTPUT_OBJ:
         ehdr.e_type = ET_REL;

Keyboard shortcuts