merge patched into master

5 files changed, 28 insertions, 54 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 2640cb3..699a551 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-506de045eee57bad9eea1cf50cbe62088f3a5113
-506de045eee57bad9eea1cf50cbe62088f3a5113
-3f2e65a51523fbb98a44b71c29ae3a3fcc13854b
+f4ab37b20a5b328cd681740fb2eed649d994b8c1
+f4ab37b20a5b328cd681740fb2eed649d994b8c1
+e2ccf3981d78dfeb390d22c74625b60310100abb
 e2ccf3981d78dfeb390d22c74625b60310100abb
 tcc_0.9.27.orig.tar.bz2
 3bab3acd404ea92ba18e0c261d9d8cb2f366a8a5
diff --git a/debian/patches/0002-Disable-test-not-working-on-i386.patch b/debian/patches/0001-Disable-test-not-working-on-i386.patch
index 8e52339..2c41791 100644
--- a/debian/patches/0002-Disable-test-not-working-on-i386.patch
+++ b/debian/patches/0001-Disable-test-not-working-on-i386.patch
@@ -1,4 +1,4 @@
-From ef905272c2027276a00c1a8d0950c2f46eade78e Mon Sep 17 00:00:00 2001
+From 557d51707f31b75321fc25d80e5bf249895d171c Mon Sep 17 00:00:00 2001
 From: Thomas Preud'homme <robotux@celest.fr>
 Date: Sun, 17 Feb 2013 23:39:08 +0100
 Subject: Disable test not working on i386
@@ -9,16 +9,16 @@ disable the test on such platform while upstream fixes it.
 
 Origin: vendor
 Forwarded: no
-Last-Update: 2016-12-17
+Last-Update: 2018-02-21
 ---
  tests/tcctest.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/tests/tcctest.c b/tests/tcctest.c
-index 0f714822..23fa9f9d 100644
+index 57670bea..3e0ae8bc 100644
 --- a/tests/tcctest.c
 +++ b/tests/tcctest.c
-@@ -3140,6 +3140,7 @@ void override_func2 (void)
+@@ -3184,6 +3184,7 @@ void override_func2 (void)
    printf ("asmc: override2\n");
  }
  
@@ -26,21 +26,21 @@ index 0f714822..23fa9f9d 100644
  /* This checks a construct used by the linux kernel to encode
     references to strings by PC relative references.  */
  extern int bug_table[] __attribute__((section("__bug_table")));
-@@ -3161,6 +3162,7 @@ char * get_asm_string (void)
+@@ -3205,6 +3206,7 @@ char * get_asm_string (void)
    char * str = ((char*)bug_table) + bug_table[1];
    return str;
  }
 +#endif
  
- unsigned int set;
- 
-@@ -3319,7 +3321,9 @@ void asm_test(void)
-     if (!somebool)
-       printf("asmbool: failed\n");
- #endif
+ /* This checks another constructs with local labels.  */
+ extern unsigned char alld_stuff[];
+@@ -3460,7 +3462,9 @@ void asm_test(void)
+        the global one, not the local decl from this function.  */
+     asm volatile(".weak override_func3\n.set override_func3, base_func");
+     override_func3();
 +#ifndef __i386__
      printf("asmstr: %s\n", get_asm_string());
 +#endif
-     val = 43;
-     fancy_copy (&val, &val2);
-     printf ("fancycpy(%d)=%d\n", val, val2);
+     asm_local_label_diff();
+     asm_local_statics();
+ #endif
diff --git a/debian/patches/0001-Update-version-to-reflect-package-version.patch b/debian/patches/0001-Update-version-to-reflect-package-version.patch
deleted file mode 100644
index ddd7d87..0000000
--- a/debian/patches/0001-Update-version-to-reflect-package-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d2938674c0a51bc96830beb608b25d556f58a68 Mon Sep 17 00:00:00 2001
-From: Thomas Preud'homme <robotux@celest.fr>
-Date: Sun, 17 Feb 2013 23:39:08 +0100
-Subject: Update version to reflect package version
-
-There is plan upstream to make a TinyCC release in the comming month or
-two. The code is thus much closer to the one that will be in the 0.9.27
-release than the one in the 0.9.26 release. The Debian package version
-reflects that and this patch changes the upstream version so that the
-version output by tcc -v matches the one of the Debian package.
-
-Origin: vendor
-Forwarded: no
-Last-Update: 2016-12-17
----
- VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/VERSION b/VERSION
-index 46e7a712..a2ff443c 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--0.9.26
-+0.9.27 (prerelease)
diff --git a/debian/patches/0003-Disable-stack-protector-in-runtime-library.patch b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch
index ec5be2c..243bc23 100644
--- a/debian/patches/0003-Disable-stack-protector-in-runtime-library.patch
+++ b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch
@@ -1,4 +1,4 @@
-From 506de045eee57bad9eea1cf50cbe62088f3a5113 Mon Sep 17 00:00:00 2001
+From f4ab37b20a5b328cd681740fb2eed649d994b8c1 Mon Sep 17 00:00:00 2001
 From: Thomas Preud'homme <robotux@celest.fr>
 Date: Sun, 17 Feb 2013 23:39:08 +0100
 Subject: Disable stack protector in runtime library
@@ -9,20 +9,20 @@ when libtcc1.a is build with -fstack-protector.
 
 Origin: vendor
 Forwarded: no
-Last-Update: 2016-12-18
+Last-Update: 2018-02-21
 ---
  lib/Makefile | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/Makefile b/lib/Makefile
-index e61437ef..79891d4e 100644
+index 0c1ec54d..385ffae4 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -44,6 +44,7 @@ ARM_O = libtcc1.o armeabi.o alloca-arm.o
- ARM64_O = lib-arm64.o
- WIN32_O = crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
+@@ -20,6 +20,7 @@ XCFG = $(or $(findstring -win,$T),-unx)
+ # in order to use gcc, tyoe: make <target>-libtcc1-usegcc=yes
+ arm-libtcc1-usegcc ?= no
  
 +CFLAGS:=$(filter-out -fstack-protector%,$(CFLAGS))
- # build TCC runtime library to contain PIC code, so it can be linked
- # into shared libraries
- PICFLAGS = -fPIC
+ ifeq "$($(T)-libtcc1-usegcc)" "yes"
+  XCC = $(CC)
+  XAR = $(AR)
diff --git a/debian/patches/series b/debian/patches/series
index 5a76d00..43899e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Update-version-to-reflect-package-version.patch
-0002-Disable-test-not-working-on-i386.patch
-0003-Disable-stack-protector-in-runtime-library.patch
+0001-Disable-test-not-working-on-i386.patch
+0002-Disable-stack-protector-in-runtime-library.patch