From 0a624782dfc8fee6f0600066b135d3b20e4274f4 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Sat, 1 Oct 2016 21:06:33 +0200
Subject: build: revert Makefiles to 0.9.26 state (mostly)

Except
- that libtcc1.a is now installed in subdirs i386/ etc.
- the support for arm and arm64
- some of the "Darwin" fixes
- tests are mosly unchanged

Also
- removed the "legacy links for cross compilers" (was total mess)
- removed "out-of-tree" build support (was broken anyway)
---
 tccelf.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'tccelf.c')

diff --git a/tccelf.c b/tccelf.c
index 33ee076..0aa7014 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -1555,24 +1555,7 @@ static void add_init_array_defines(TCCState *s1, const char *section_name)
 static int tcc_add_support(TCCState *s1, const char *filename)
 {
     char buf[1024];
-    snprintf(buf, sizeof(buf), "%s/%s/%s", s1->tcc_lib_path,
-    /* an cpu specific path inside tcc_lib_path, mainly for keeping libtcc1.a */
-    #ifdef TCC_TARGET_I386
-	"i386"
-    #endif
-    #ifdef TCC_TARGET_X86_64
-        "x86-64"
-    #endif
-    #ifdef TCC_TARGET_ARM
-	"arm"
-    #endif
-    #ifdef TCC_TARGET_ARM64
-	"arm64"
-    #endif
-    #ifdef TCC_TARGET_C67
-	"C67"
-    #endif
-	,filename);
+    snprintf(buf, sizeof(buf), "%s/"TCC_ARCH_DIR"%s", s1->tcc_lib_path, filename);
     return tcc_add_file(s1, buf);
 }
 
-- 
cgit v1.3.1