From 5f33d313c8a2455ff9036cd7f7028339bdbde622 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Mon, 20 Feb 2017 18:58:08 +0100
Subject: tcc: re-enable correct option -r support

Forgot about it.  It allows to compile several
sources (and other .o's) to one single .o file;

    tcc -r -o all.o f1.c f2.c f3.S o4.o ...

Also:
- option -fold-struct-init-code removed, no effect anymore
- (tcc_)set_environment() moved to tcc.c
- win32/lib/(win)crt1 minor fix & add dependency
- debug line output for asm (tcc -c -g xxx.S) enabled
- configure/Makefiles: x86-64 -> x86_64 changes
- README: cleanup
---
 lib/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/Makefile')

diff --git a/lib/Makefile b/lib/Makefile
index 85dc5cf..1fb37af 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,14 +9,14 @@ VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib
 ifndef TARGET
  # we're building the native libtcc1.a
  ifdef CONFIG_WIN32
-  ifeq ($(ARCH),x86-64)
+  ifeq ($(ARCH),x86_64)
    TARGET = x86_64-win32
   else
    TARGET = i386-win32
   endif
  else ifeq ($(ARCH),i386)
   TARGET = i386
- else ifeq ($(ARCH),x86-64)
+ else ifeq ($(ARCH),x86_64)
   TARGET = x86_64
  else ifeq ($(ARCH),arm)
   TARGET = arm
@@ -83,6 +83,9 @@ $(DIR)/%.o : %.c
 $(DIR)/%.o : %.S
 	$(XCC) -c $< -o $@ $(TGT) $(XFLAGS)
 
+$(DIR)/crt1w.o : crt1.c
+$(DIR)/wincrt1w.o : wincrt1.c
+
 $(OBJ) : $(DIR)/exists
 
 %/exists :
-- 
cgit v1.3.1