tcc/lib: reduce number of files

271 insertions(+), 292 deletions(-), -21 lines, -5 files Also: - tccdefs.h: WIN32: less (no) __builtins - libtcc.c: simply ignore -arch

grischka committed 5 years ago

Commit 675046b1 parent e53816016 files · +271 −292Browse files

Showing the changes to libtcc.c (1 of 16 files). Show all

Unified · Split

libtcc.c+27−55

     return path;
 }
-/* NULL if this is tcc.exe, HINSTANCE if this is libtcc.dll */
+#if defined LIBTCC_AS_DLL && !defined CONFIG_TCCDIR
 static HMODULE tcc_module;
+BOOL WINAPI DllMain (HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved)
+{
+    if (DLL_PROCESS_ATTACH == dwReason)
+        tcc_module = hDll;
+    return TRUE;
+}
+#else
+#define tcc_module NULL /* NULL means executable itself */
+#endif
 #ifndef CONFIG_TCCDIR
 /* on win32, we suppose the lib and includes are at the location of 'tcc.exe' */
     tcc_add_library_path(s, normalize_slashes(buf));
 }
 #endif
-#ifdef LIBTCC_AS_DLL
-BOOL WINAPI DllMain (HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-    if (DLL_PROCESS_ATTACH == dwReason)
-        tcc_module = hDll;
-    return TRUE;
-}
-#endif
 #endif
 /********************************************************/
     return e ? e : strchr(b, 0);
 }
+ST_FUNC char *tcc_load_text(int fd)
+{
+    int len = lseek(fd, 0, SEEK_END);
+    char *buf = load_data(fd, 0, len + 1);
+    buf[len] = 0;
+    return buf;
+}
 /********************************************************/
 /* memory management */
 } TCCOption;
 enum {
+    TCC_OPTION_ignored = 0,
     TCC_OPTION_HELP,
     TCC_OPTION_HELP2,
     TCC_OPTION_v,
     TCC_OPTION_soname,
     TCC_OPTION_o,
     TCC_OPTION_r,
-    TCC_OPTION_s,
-    TCC_OPTION_traditional,
     TCC_OPTION_Wl,
     TCC_OPTION_Wp,
     TCC_OPTION_W,
     TCC_OPTION_nostdlib,
     TCC_OPTION_print_search_dirs,
     TCC_OPTION_rdynamic,
-    TCC_OPTION_param,
-    TCC_OPTION_pedantic,
     TCC_OPTION_pthread,
     TCC_OPTION_run,
     TCC_OPTION_w,
-    TCC_OPTION_pipe,
     TCC_OPTION_E,
     TCC_OPTION_M,
     TCC_OPTION_MD,
     TCC_OPTION_x,
     TCC_OPTION_ar,
     TCC_OPTION_impdef,
-    TCC_OPTION_C,
-    TCC_OPTION_arch
 };
 #define TCC_OPTION_HAS_ARG 0x0001
     { "shared", TCC_OPTION_shared, 0 },
     { "soname", TCC_OPTION_soname, TCC_OPTION_HAS_ARG },
     { "o", TCC_OPTION_o, TCC_OPTION_HAS_ARG },
-    { "-param", TCC_OPTION_param, TCC_OPTION_HAS_ARG },
-    { "pedantic", TCC_OPTION_pedantic, 0},
     { "pthread", TCC_OPTION_pthread, 0},
     { "run", TCC_OPTION_run, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "rdynamic", TCC_OPTION_rdynamic, 0 },
     { "r", TCC_OPTION_r, 0 },
-    { "s", TCC_OPTION_s, 0 },
-    { "traditional", TCC_OPTION_traditional, 0 },
     { "Wl,", TCC_OPTION_Wl, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "Wp,", TCC_OPTION_Wp, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "W", TCC_OPTION_W, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "nostdlib", TCC_OPTION_nostdlib, 0 },
     { "print-search-dirs", TCC_OPTION_print_search_dirs, 0 },
     { "w", TCC_OPTION_w, 0 },
-    { "pipe", TCC_OPTION_pipe, 0},
     { "E", TCC_OPTION_E, 0},
     { "M", TCC_OPTION_M, 0},
     { "MD", TCC_OPTION_MD, 0},
 #ifdef TCC_TARGET_PE
     { "impdef", TCC_OPTION_impdef, 0},
 #endif
-#ifdef TCC_TARGET_MACHO
+    /* ignored (silently, except after -Wunsupported) */
-    { "arch", TCC_OPTION_arch, TCC_OPTION_HAS_ARG },
+    { "arch", 0, TCC_OPTION_HAS_ARG},
-#endif
+    { "C", 0, 0 },
-    { "C", TCC_OPTION_C, 0},
+    { "-param", 0, TCC_OPTION_HAS_ARG },
+    { "pedantic", 0, 0 },
+    { "pipe", 0, 0 },
+    { "s", 0, 0 },
+    { "traditional", 0, 0 },
     { NULL, 0, 0 },
 };
     return ret;
 }
-ST_FUNC char *tcc_load_text(int fd)
-{
-    int len = lseek(fd, 0, SEEK_END);
-    char *buf = load_data(fd, 0, len + 1);
-    buf[len] = 0;
-    return buf;
-}
 /* read list file */
 static void args_parser_listfile(TCCState *s,
     const char *filename, int optind, int *pargc, char ***pargv)
                 tcc_error("cannot parse %s here", r);
             tool = x;
             break;
-#if defined(TCC_TARGET_MACHO)
-        case TCC_OPTION_arch:
-#if defined(TCC_TARGET_X86_64)
-            if (strcmp(optarg, "x86_64") == 0)
-                break; /* Ok, arch matches target */
-#endif
-#if defined(TCC_TARGET_ARM64)
-            if (strcmp(optarg, "arm64") == 0)
-                break; /* Ok, arch matches target */
-#endif
-            tcc_error("this compiler does not support %s", optarg);
-            /* ignored */
-            break;
-#endif
-        case TCC_OPTION_traditional:
-        case TCC_OPTION_pedantic:
-        case TCC_OPTION_pipe:
-        case TCC_OPTION_s:
-        case TCC_OPTION_C:
-            /* ignored */
-            break;
         default:
 unsupported_option:
             tcc_warning_c(warn_unsupported)("unsupported option '%s'", r);

tcc/lib: reduce number of files

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code