History

tcc -ar: pad archive member position to even

Since commit 45cff8f0 tcc eventually generates object files of non-even size. tccelf.c: - check ARFMAG for better invalid archive detection - file_offset needs to be aligned, not the size (just a nitpick) lib/Makefile: - remake everything when tcc did change

grischka committed 2 years ago

Commit 9fb89c21 parent d7f91663 files · +25 −12Browse files

Unified · Split

3 files
  1. lib/Makefile +14 −7
  2. tccelf.c +4 −3
  3. tcctools.c +7 −2
lib/Makefile+14−7
@@ -8,6 +8,7 @@ VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib · 7 unmodified lines
88 T = $(or $(CROSS_TARGET),$(NATIVE_TARGET),unknown)
99 X = $(if $(CROSS_TARGET),$(CROSS_TARGET)-)
1010
11+TCC = $(TOP)/$(X)tcc$(EXESUF)
1112 XTCC ?= $(TOP)/$(X)tcc$(EXESUF)
1213 XCC = $(XTCC)
1314 XAR = $(XTCC) -ar
@@ -44,6 +45,9 @@ $(X)BT_O += runmain.o tcov.o · 30 unmodified lines
4445
4546 DSO_O = dsohandle.o
4647
48+# not in libtcc1.a
49+EXTRA_O = runmain.o bt-exe.o bt-dll.o bt-log.o bcheck.o
50+
4751 I386_O = libtcc1.o alloca.o alloca-bt.o stdatomic.o atomic.o builtin.o $(BT_O)
4852 X86_64_O = libtcc1.o alloca.o alloca-bt.o stdatomic.o atomic.o builtin.o $(BT_O)
4953 ARM_O = libtcc1.o armeabi.o alloca.o armflush.o stdatomic.o atomic.o builtin.o $(BT_O)
@@ -67,23 +71,23 @@ OBJ-arm-eabihf = $(ARM_O) $(DSO_O) · 17 unmodified lines
6771 OBJ-arm-wince = $(ARM_O) $(WIN_O)
6872 OBJ-riscv64 = $(RISCV64_O) $(BCHECK_O) $(DSO_O)
6973
70−OBJ-extra = $(filter $(B_O) runmain.o,$(OBJ-$T))
74+OBJ-extra = $(filter $(EXTRA_O),$(OBJ-$T))
7175 OBJ-libtcc1 = $(addprefix $(X),$(filter-out $(OBJ-extra),$(OBJ-$T)))
7276
7377 ALL = $(addprefix $(TOP)/,$(X)libtcc1.a $(OBJ-extra))
7478
7579 all: $(ALL)
7680
77−$(TOP)/$(X)libtcc1.a : $(OBJ-libtcc1)
78− $S$(XAR) rcs $@ $^
81+$(TOP)/$(X)libtcc1.a : $(OBJ-libtcc1) $(TCC)
82+ $S$(XAR) rcs $@ $(OBJ-libtcc1)
7983
80−$(X)%.o : %.c
84+$(X)%.o : %.c $(TCC)
8185 $S$(XCC) -c $< -o $@ $(XFLAGS)
8286
83−$(X)%.o : %.S
87+$(X)%.o : %.S $(TCC)
8488 $S$(XCC) -c $< -o $@ $(XFLAGS)
8589
86−$(TOP)/%.o : %.c
90+$(TOP)/%.o : %.c $(TCC)
8791 $S$(XCC) -c $< -o $@ $(XFLAGS)
8892
8993 $(TOP)/bcheck.o : XFLAGS += $(BFLAGS) $(if $(CONFIG_musl),-DTCC_MUSL)
@@ -92,5 +96,8 @@ $(TOP)/bt-exe.o : $(TOP)/tccrun.c · 2 unmodified lines
9296 $(X)crt1w.o : crt1.c
9397 $(X)wincrt1w.o : wincrt1.c
9498
99+# don't try to make it
100+$(TCC) : ;
101+
95102 clean :
96− rm -f *.a *.o $(ALL)
103+ rm -f *.o $(addprefix $(TOP)/,*libtcc1.a $(EXTRA_O))
tccelf.c+4−3
@@ -3374,6 +3374,8 @@ static int read_ar_header(int fd, int offset, ArchiveHeader *hdr) · 3373 unmodified lines
33743374 len = full_read(fd, hdr, sizeof(ArchiveHeader));
33753375 if (len != sizeof(ArchiveHeader))
33763376 return len ? -1 : 0;
3377+ if (memcmp(hdr->ar_fmag, ARFMAG, sizeof hdr->ar_fmag))
3378+ return -1;
33773379 p = hdr->ar_name;
33783380 for (e = p + sizeof hdr->ar_name; e > p && e[-1] == ' ';)
33793381 --e;
@@ -3451,8 +3453,6 @@ ST_FUNC int tcc_load_archive(TCCState *s1, int fd, int alacarte) · 71 unmodified lines
34513453 return tcc_error_noabort("invalid archive");
34523454 file_offset += len;
34533455 size = strtol(hdr.ar_size, NULL, 0);
3454− /* align to even */
3455− size = (size + 1) & ~1;
34563456 if (alacarte) {
34573457 /* coff symbol table : we handle it */
34583458 if (!strcmp(hdr.ar_name, "/"))
@@ -3465,7 +3465,8 @@ ST_FUNC int tcc_load_archive(TCCState *s1, int fd, int alacarte) · 6 unmodified lines
34653465 if (tcc_load_object_file(s1, fd, file_offset) < 0)
34663466 return -1;
34673467 }
3468− file_offset += size;
3468+ /* align to even */
3469+ file_offset = (file_offset + size + 1) & ~1;
34693470 }
34703471 }
34713472
tcctools.c+7−2
@@ -87,7 +87,7 @@ ST_FUNC int tcc_tool_ar(TCCState *s1, int argc, char **argv) · 86 unmodified lines
8787 ElfW(Shdr) *shdr;
8888 ElfW(Sym) *sym;
8989 int i, fsize, i_lib, i_obj;
90− char *buf, *shstr, *symtab = NULL, *strtab = NULL;
90+ char *buf, *shstr, *symtab, *strtab;
9191 int symtabsize = 0;//, strtabsize = 0;
9292 char *anames = NULL;
9393 int *afpos = NULL;
@@ -174,6 +174,8 @@ no_ar: · 80 unmodified lines
174174 /* ignore date/uid/gid/mode */
175175 }
176176 }
177+ if (fsize & 1)
178+ fgetc(fh);
177179 tcc_free(buf);
178180 }
179181 ret = 0;
@@ -232,6 +234,7 @@ finish: · 52 unmodified lines
232234
233235 shdr = (ElfW(Shdr) *) (buf + ehdr->e_shoff + ehdr->e_shstrndx * ehdr->e_shentsize);
234236 shstr = (char *)(buf + shdr->sh_offset);
237+ symtab = strtab = NULL;
235238 for (i = 0; i < ehdr->e_shnum; i++)
236239 {
237240 shdr = (ElfW(Shdr) *) (buf + ehdr->e_shoff + i * ehdr->e_shentsize);
@@ -252,7 +255,7 @@ finish: · 14 unmodified lines
252255 }
253256 }
254257
255− if (symtab && symtabsize)
258+ if (symtab && strtab)
256259 {
257260 int nsym = symtabsize / sizeof(ElfW(Sym));
258261 //printf("symtab: info size shndx name\n");
@@ -298,6 +301,8 @@ finish: · 39 unmodified lines
298301 tcc_free(buf);
299302 i_obj++;
300303 fpos += (fsize + sizeof(arhdro));
304+ if (fpos & 1)
305+ fputc(0, fo), ++fpos;
301306 }
302307 hofs = 8 + sizeof(arhdr) + strpos + (funccnt+1) * sizeof(int);
303308 fpos = 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t