Revert "--whole-archive support"

- would parse linker args in two different places - would mess up "tcc -v ..." output: tcc -v test.c -> test.c +> test.c - would use function "tcc_load_alacarte()" to do the contrary of what its name suggests. This reverts commit 19a169ceb896f78205bc23b847938c58f14d1dda.

grischka committed 10 years ago

Commit cf32bb81 parent e238e656 files · +3 −43Browse files

Unified · Split

6 files

libtcc.c +1 −13
libtcc.h +0 −2
tcc-doc.texi +0 −8
tcc.c +2 −16
tcc.h +0 −1
tccelf.c +0 −3

libtcc.c+1−13

     ret = tcc_load_ldscript(s1);
 #endif
     if (ret < 0)
-        tcc_error_noabort("%s: unrecognized file type (error=%d)", filename, ret);
+        tcc_error_noabort("unrecognized file type");
 the_end:
-    if (s1->verbose)
-        printf("+> %s\n", filename);
     tcc_close();
     return ret;
 }
             s->rdynamic = 1;
             break;
         case TCC_OPTION_Wl:
-            if (optarg && *optarg == '-') {
-                int offs = 0;
-                if (!strncmp("-no", optarg+1, 3))
-                    offs += 3;
-                if (!strcmp("-whole-archive", optarg+1 + offs)) {
-                    args_parser_add_file(s, "", (offs == 0) ? TCC_FILETYPE_AR_WHOLE_ON :
-                        TCC_FILETYPE_AR_WHOLE_OFF);
-                    break;
-                }
-            }
             if (pas->linker_arg.size)
                 --pas->linker_arg.size, cstr_ccat(&pas->linker_arg, ',');
             cstr_cat(&pas->linker_arg, optarg, 0);

libtcc.h+0−2

@@ -53,8 +53,6 @@ LIBTCCAPI int tcc_add_file(TCCState s, const char filename, int filetype); · 52 unmodified lines
53	#define TCC_FILETYPE_C 2	53	#define TCC_FILETYPE_C 2
54	#define TCC_FILETYPE_ASM 3	54	#define TCC_FILETYPE_ASM 3
55	#define TCC_FILETYPE_ASM_PP 4	55	#define TCC_FILETYPE_ASM_PP 4
56	#define TCC_FILETYPE_AR_WHOLE_OFF 5
57	#define TCC_FILETYPE_AR_WHOLE_ON 6
58		56
59	/* compile a string containing a C source. Return -1 if error. */	57	/* compile a string containing a C source. Return -1 if error. */
60	LIBTCCAPI int tcc_compile_string(TCCState s, const char buf);	58	LIBTCCAPI int tcc_compile_string(TCCState s, const char buf);

tcc-doc.texi+0−8

@@ -317,14 +317,6 @@ Generate an object file combining all input files. · 316 unmodified lines
317	@item -Wl,-rpath=path	317	@item -Wl,-rpath=path
318	Put custom search path for dynamic libraries into executable.	318	Put custom search path for dynamic libraries into executable.
319		319
320	@item -Wl,--whole-archive
321	Add a whole archive, not just the symbols of the archive that would
322	satisfy undefined symbols in the program.
323
324	@item -Wl,--no-whole-archive
325	Turn off the effect of the --whole-archive option for subsequent archive
326	files.
327
328	@item -Wl,--oformat=fmt	320	@item -Wl,--oformat=fmt
329	Use @var{fmt} as output format. The supported output formats are:	321	Use @var{fmt} as output format. The supported output formats are:
330	@table @code	322	@table @code

tcc.c+2−16

 #endif
 }
-static void set_whole_archive(TCCState* s, int on)
-{
-    s->whole_archive = on;
-    if (1 == s->verbose)
-        printf("%cwhole-archive>\n", s->whole_archive? '+' : '-');
-}
 int main(int argc, char **argv)
 {
     TCCState *s;
     for(i = ret = 0; i < s->nb_files && ret == 0; i++) {
         int filetype = *(unsigned char *)s->files[i];
         const char *filename = s->files[i] + 1;
-        if (filetype == TCC_FILETYPE_AR_WHOLE_ON ||
-            filetype == TCC_FILETYPE_AR_WHOLE_OFF)
-        {
-            set_whole_archive(s, filetype == TCC_FILETYPE_AR_WHOLE_ON);
-            continue;
-        }
-        if (1 == s->verbose)
-            printf("-> %s\n", filename);
         if (filename[0] == '-' && filename[1] == 'l') {
             if (tcc_add_library(s, filename + 2) < 0) {
                 /* don't fail on -lm as it's harmless to skip math lib */
                 }
             }
         } else {
+            if (1 == s->verbose)
+                printf("-> %s\n", filename);
             if (!s->outfile)
                 s->outfile = default_outputfile(s, filename);
             if (tcc_add_file(s, filename, filetype) < 0)
             }
         }
     }
-    set_whole_archive(s, 0);
     if (0 == ret) {
         if (s->output_type == TCC_OUTPUT_MEMORY) {

tcc.h+0−1

@@ -692,7 +692,6 @@ struct TCCState { · 691 unmodified lines
692	int rdynamic; /* if true, all symbols are exported */	692	int rdynamic; /* if true, all symbols are exported */
693	int symbolic; /* if true, resolve symbols in the current module first */	693	int symbolic; /* if true, resolve symbols in the current module first */
694	int alacarte_link; /* if true, only link in referenced objects from archive */	694	int alacarte_link; /* if true, only link in referenced objects from archive */
695	int whole_archive; /* if true, link in a whole .a even when alacarte_link /
696		695
697	char tcc_lib_path; / CONFIG_TCCDIR or -B option */	696	char tcc_lib_path; / CONFIG_TCCDIR or -B option */
698	char soname; / as specified on the command line (-soname) */	697	char soname; / as specified on the command line (-soname) */

tccelf.c+0−3

             if(sym_index) {
                 sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
                 if(sym->st_shndx == SHN_UNDEF) {
-            load_obj:
                     off = get_be32(ar_index + i * 4) + sizeof(ArchiveHeader);
                     ++bound;
                     lseek(fd, off, SEEK_SET);
                         goto the_end;
                     }
                 }
-            } else if (s1->whole_archive) {
-                goto load_obj;
             }
         }
     } while(bound);

Revert "--whole-archive support"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code