bored...

/* Use "-g" as alias for "-g1". Use "-g0" to disable debug */

So not using -g is now the alias for -g0 ?!?

This reverts commit 8759b25.
This reverts commit 3ce7bc6.
This reverts commit 5fb582a.
This reverts commit aea68db.
This reverts commit fa9c31c.
This reverts commit b3bebdb.
This reverts commit ecf8e5a.
This reverts commit fe6b5c0.
This reverts commit e2e5377.
This reverts commit 1cd7998.

Author: grischka

.gitignore

@@ -28,7 +28,7 @@ c2str
 tags
 TAGS
 tcc.1
-tcc.pod
+*.pod
 tcc-doc.html
 tcc-doc.info
 

Makefile

@@ -8,12 +8,6 @@ ifndef TOP
  INCLUDED = no
 endif
 
-# Uncomment the next two commands to allow debug this Makefile
-# When enabled, GNU make will no longer execute commands directly.
-# All build commands will be executed using the shell. This needs more time
-#OLD_SHELL := $(SHELL)
-#SHELL = $(info Building $* $(if $<, (from $<))$(if $?, ($? newer)))$(OLD_SHELL)
-
 ifeq ($(findstring $(MAKECMDGOALS),clean distclean),)
  include $(TOP)/config.mak
 endif
@@ -244,7 +238,7 @@ endif
 
 # convert "include/tccdefs.h" to "tccdefs_.h"
 %_.h : include/%.h conftest.c
-	$S$(CC) -DC2STR $(filter %.c,$^) -o c2str$(EXESUF) && ./c2str$(EXESUF) $< $@
+	$S$(CC) -DC2STR $(filter %.c,$^) -o c2str.exe && ./c2str.exe $< $@
 
 # target specific object rule
 $(X)%.o : %.c $(LIBTCC_INC)
@@ -261,7 +255,7 @@ tcc$(EXESUF): tcc.o $(LIBTCC)
 # Cross Tiny C Compilers
 # (the TCCDEFS_H dependency is only necessary for parallel makes,
 # ala 'make -j x86_64-tcc i386-tcc tcc', which would create multiple
-# c2str and tccdefs_.h files in parallel, leading to access errors.
+# c2str.exe and tccdefs_.h files in parallel, leading to access errors.
 # This forces it to be made only once.  Make normally tracks multiple paths
 # to the same goals and only remakes it once, but that doesn't work over
 # sub-makes like in this target)
@@ -332,6 +326,8 @@ tcc.1 : tcc-doc.pod
 %.pod : %.texi
 	$(call run-if,perl,$(TOPSRC)/texi2pod.pl $< $@)
 
+doc : $(TCCDOCS)
+
 # --------------------------------------------------------------------------
 # install
 
@@ -410,10 +406,6 @@ tags : ; ctags $(TAGFILES)
 # cannot have both tags and TAGS on windows
 ETAGS : ; etags $(TAGFILES)
 
-# documentation
-doc: tcc-doc.html tcc-doc.info tcc.1
-
-
 # create release tarball from *current* git branch (including tcc-doc.html
 # and converting two files to CRLF)
 TCC-VERSION = tcc-$(VERSION)
@@ -443,15 +435,16 @@ testspp.%:
 	@$(MAKE) -C tests/pp $@
 
 clean:
-	@rm -f tcc$(EXESUF) tcc_p$(EXESUF) *-tcc$(EXESUF) tcc.pod tags ETAGS
+	@rm -f tcc$(EXESUF) tcc_p$(EXESUF) *-tcc$(EXESUF) tags ETAGS *.pod
 	@rm -f *.o *.a *.so* *.out *.log lib*.def *.exe *.dll a.out *.dylib *_.h
 	@$(MAKE) -s -C lib $@
 	@$(MAKE) -s -C tests $@
 
 distclean: clean
-	@rm -fv config.h config.mak config.texi tcc.1 tcc-doc.info tcc-doc.html
+	@rm -fv config.h config.mak config.texi
+	@rm -fv $(TCCDOCS)
 
-.PHONY: all clean test tar tags ETAGS distclean install uninstall FORCE
+.PHONY: all clean test tar tags ETAGS doc distclean install uninstall FORCE
 
 help:
 	@echo "make"

arm-asm.c

@@ -77,21 +77,6 @@ static int asm_parse_vfp_regvar(int t, int double_precision)
     return -1;
 }
 
-__attribute__((unused))
-static int asm_parse_vfp_status_regvar(int t)
-{
-    switch (t) {
-    case TOK_ASM_fpsid:
-        return 0;
-    case TOK_ASM_fpscr:
-        return 1;
-    case TOK_ASM_fpexc:
-        return 8;
-    default:
-        return -1;
-    }
-}
-
 /* Parse a text containing operand and store the result in OP */
 static void parse_operand(TCCState *s1, Operand *op)
 {
@@ -2240,6 +2225,20 @@ static void asm_floating_point_data_processing_opcode(TCCState *s1, int token) {
     asm_emit_coprocessor_opcode(condition_code_of_token(token), coprocessor, opcode1, ops[0].reg, (ops[1].type == OP_IM8) ? ops[1].e.v : ops[1].reg, (ops[2].type == OP_IM8) ? ops[2].e.v : ops[2].reg, opcode2, 0);
 }
 
+static int asm_parse_vfp_status_regvar(int t)
+{
+    switch (t) {
+    case TOK_ASM_fpsid:
+        return 0;
+    case TOK_ASM_fpscr:
+        return 1;
+    case TOK_ASM_fpexc:
+        return 8;
+    default:
+        return -1;
+    }
+}
+
 static void asm_floating_point_status_register_opcode(TCCState* s1, int token)
 {
     uint8_t coprocessor = CP_SINGLE_PRECISION_FLOAT;

arm-link.c

@@ -28,6 +28,7 @@ enum float_abi {
 
 #include "tcc.h"
 
+#ifdef NEED_RELOC_TYPE
 /* Returns 1 for a code relocation, 0 for a data relocation. For unknown
    relocations, returns -1. */
 int code_reloc (int reloc_type)
@@ -107,7 +108,7 @@ int gotplt_entry_type (int reloc_type)
     return -1;
 }
 
-#ifndef TCC_TARGET_PE
+#ifdef NEED_BUILD_GOT
 ST_FUNC unsigned create_plt_entry(TCCState *s1, unsigned got_offset, struct sym_attr *attr)
 {
     Section *plt = s1->plt;
@@ -177,6 +178,7 @@ ST_FUNC void relocate_plt(TCCState *s1)
     }
 }
 #endif
+#endif
 
 void relocate(TCCState *s1, ElfW_Rel *rel, int type, unsigned char *ptr, addr_t addr, addr_t val)
 {

arm64-link.c

@@ -22,6 +22,7 @@
 
 #include "tcc.h"
 
+#ifdef NEED_RELOC_TYPE
 /* Returns 1 for a code relocation, 0 for a data relocation. For unknown
    relocations, returns -1. */
 int code_reloc (int reloc_type)
@@ -91,7 +92,7 @@ int gotplt_entry_type (int reloc_type)
     return -1;
 }
 
-__attribute__((unused))
+#ifdef NEED_BUILD_GOT
 ST_FUNC unsigned create_plt_entry(TCCState *s1, unsigned got_offset, struct sym_attr *attr)
 {
     Section *plt = s1->plt;
@@ -111,7 +112,6 @@ ST_FUNC unsigned create_plt_entry(TCCState *s1, unsigned got_offset, struct sym_
 
 /* relocate the PLT: compute addresses and offsets in the PLT now that final
    address for PLT and GOT are known (see fill_program_header) */
-__attribute__((unused))
 ST_FUNC void relocate_plt(TCCState *s1)
 {
     uint8_t *p, *p_end;
@@ -166,6 +166,8 @@ ST_FUNC void relocate_plt(TCCState *s1)
 	}
     }
 }
+#endif
+#endif
 
 void relocate(TCCState *s1, ElfW_Rel *rel, int type, unsigned char *ptr, addr_t addr, addr_t val)
 {

configure

@@ -27,8 +27,7 @@ mandir=""
 infodir=""
 sysroot=""
 cross_prefix=""
-test -z "$CC" && CC="gcc"
-test -z "$cc" && cc="$CC"
+cc="gcc"
 ar="ar"
 bigendian="no"
 mingw32="no"
@@ -46,7 +45,7 @@ confvars=
 suggest="yes"
 gcc_major=0
 gcc_minor=0
-cc_name="$cc"
+cc_name="gcc"
 ar_set=
 darwin=
 cpu=
@@ -408,6 +407,7 @@ if test "$cc_name" != "tcc"; then
   OPT1="-Wdeclaration-after-statement -fno-strict-aliasing"
   # we want -Wno- but gcc does not always reject unknown -Wno- options
   OPT2="-Wpointer-sign -Wsign-compare -Wunused-result -Wformat-truncation"
+  OPT2="$OPT2 -Wstringop-truncation"
   if test "$cc_name" = "clang"; then
     OPT1="$OPT1 -fheinous-gnu-extensions"
     OPT2="$OPT2 -Wstring-plus-int"

i386-asm.c

@@ -833,6 +833,7 @@ ST_FUNC void asm_opcode(TCCState *s1, int opcode)
                 goto next;
 	    alltypes |= ops[i].type;
         }
+        (void)alltypes; /* maybe unused */
         /* all is matching ! */
         break;
     next: ;

i386-link.c

@@ -23,7 +23,7 @@
 
 #include "tcc.h"
 
-#ifndef ELF_OBJ_ONLY
+#ifdef NEED_RELOC_TYPE
 /* Returns 1 for a code relocation, 0 for a data relocation. For unknown
    relocations, returns -1. */
 int code_reloc (int reloc_type)
@@ -92,6 +92,7 @@ int gotplt_entry_type (int reloc_type)
     return -1;
 }
 
+#ifdef NEED_BUILD_GOT
 ST_FUNC unsigned create_plt_entry(TCCState *s1, unsigned got_offset, struct sym_attr *attr)
 {
     Section *plt = s1->plt;
@@ -169,6 +170,7 @@ ST_FUNC void relocate_plt(TCCState *s1)
     }
 }
 #endif
+#endif
 
 void relocate(TCCState *s1, ElfW_Rel *rel, int type, unsigned char *ptr, addr_t addr, addr_t val)
 {

libtcc.c

@@ -836,6 +836,7 @@ LIBTCCAPI void tcc_delete(TCCState *s1)
     tcc_free(s1->tcc_lib_path);
     tcc_free(s1->soname);
     tcc_free(s1->rpath);
+    tcc_free(s1->elf_entryname);
     tcc_free(s1->init_symbol);
     tcc_free(s1->fini_symbol);
     tcc_free(s1->outfile);
@@ -1567,23 +1568,6 @@ static const TCCOption tcc_options[] = {
     { NULL, 0, 0 },
 };
 
-typedef struct stdvalue {
-    uint32_t cversion;
-    const char * name;
-} stdvalue;
-
-/* accepted values for the -std= option */
-static const stdvalue std_values[] = {
-    { 199901, "c99" },
-    { 201112, "c11" },
-    { 201710, "c17" },
-    { 202000, "c2x" },
-    { 199901, "gnu99" },
-    { 201112, "gnu11" },
-    { 201710, "gnu17" },
-    { 202000, "gnu2x" }
-};
-
 typedef struct FlagDef {
     uint16_t offset;
     uint16_t flags;
@@ -1837,18 +1821,13 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int *pargc, char ***pargv, int optind)
             break;
 #endif
         case TCC_OPTION_g:
-            /* Use "-g" as alias for "-g1". Use "-g0" to disable debug */
-            /* Other common used values: "-g0", "-g1", "-g2" and "-g3" */
-            /* no failure with unsupported options */
             s->do_debug = 1;
 	    s->dwarf = DWARF_VERSION;
 	    if (*optarg == 'd') {
 		s->dwarf = 5;
 		if (!strncmp(optarg,"dwarf-",6))
                     s->dwarf = atoi(optarg + 6);
 	    }
-            else if (isnum(*optarg))
-                s->do_debug = atoi(optarg);
             break;
         case TCC_OPTION_c:
             x = TCC_OUTPUT_OBJ;
@@ -1873,21 +1852,8 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int *pargc, char ***pargv, int optind)
             s->static_link = 1;
             break;
         case TCC_OPTION_std:
-            x = 0;
-            if (*optarg == '=') {
-                do {
-                    if (strcmp(std_values[x].name, &optarg[1]) == 0) {
-                        x = std_values[x].cversion;
-                    }
-                    else
-                        ++x;
-                } while (x < (sizeof(std_values)/sizeof(stdvalue)));
-            }
-            if (x > (sizeof(std_values)/sizeof(stdvalue)))
-                s->cversion = x;
-            else
-                goto unsupported_option;
-
+            if (strcmp(optarg, "=c11") == 0)
+                s->cversion = 201112;
             break;
         case TCC_OPTION_shared:
             x = TCC_OUTPUT_DLL;
@@ -2018,11 +1984,7 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int *pargc, char ***pargv, int optind)
             s->filetype = x | (s->filetype & ~AFF_TYPE_MASK);
             break;
         case TCC_OPTION_O:
-            /* Use "-O" as alias for "-O1". */
-            /* Other common used values: "-O0", "-O1", "-O2", "-O3" and "-Os" */
-            /* no failure with unsupported options */
-            x = *optarg;
-            s->optimize = isnum(x) ? atoi(optarg) : (x) ? x : 1;
+            s->optimize = atoi(optarg);
             break;
         case TCC_OPTION_print_search_dirs:
             x = OPT_PRINT_DIRS;

tcc-doc.texi

@@ -349,7 +349,7 @@ Turn on/off linking of all objects in archives.
 Debugger options:
 
 @table @option
-@item -g[x]
+@item -g
 Generate run time stab debug information so that you get clear run time
 error messages: @code{ test.c:68: in function 'test5()': dereferencing
 invalid pointer} instead of the laconic @code{Segmentation