diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-28 21:02:15 +0000 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-28 21:02:15 +0000 |
commit | 70244afd15f090e332a1f9a87eea08b66b159226 (patch) | |
tree | 92f3a29ba21f1222a6eba63b4f99f7c30005a38f | |
parent | a4833a6c65b3296d1b60f48520489950a2b5ec86 (diff) | |
parent | 7c2261b8eef7a22a9a33a73d0a5f12039973ed5b (diff) |
merge patched into master
-rw-r--r-- | debian/.git-dpm | 4 | ||||
-rw-r--r-- | debian/patches/0004-Fix-pthread-option-handling.patch | 32 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | tcc.c | 4 |
4 files changed, 38 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 05084f8..764dbbc 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -849a2f5b4f59a0359d9d3f3620709d92e2beb8d1 -849a2f5b4f59a0359d9d3f3620709d92e2beb8d1 +7c2261b8eef7a22a9a33a73d0a5f12039973ed5b +7c2261b8eef7a22a9a33a73d0a5f12039973ed5b e2ccf3981d78dfeb390d22c74625b60310100abb e2ccf3981d78dfeb390d22c74625b60310100abb tcc_0.9.27.orig.tar.bz2 diff --git a/debian/patches/0004-Fix-pthread-option-handling.patch b/debian/patches/0004-Fix-pthread-option-handling.patch new file mode 100644 index 0000000..09ed02d --- /dev/null +++ b/debian/patches/0004-Fix-pthread-option-handling.patch @@ -0,0 +1,32 @@ +From 7c2261b8eef7a22a9a33a73d0a5f12039973ed5b Mon Sep 17 00:00:00 2001 +From: Michael Matz <matz@suse.de> +Date: Sat, 23 Dec 2017 14:49:07 +0100 +Subject: Fix -pthread option handling + +Adding -pthread confused option parsing as the number of file counting +came out wrong. + +Origin: upstream, http://repo.or.cz/tinycc.git/commit/3b27b3b1d1ae953f5ecb37f5bc95758499d66971 +Bug-Debian: https://bugs.debian.org/891592 +Last-Update: 2018-02-28 +Applied-Upstream: commit:3b27b3b1d1ae953f5ecb37f5bc95758499d66971 +--- + tcc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tcc.c b/tcc.c +index cd887d17..ee55ddda 100644 +--- a/tcc.c ++++ b/tcc.c +@@ -298,8 +298,10 @@ redo: + if (n > 1 && s->outfile) + tcc_error("cannot specify output file with -c many files"); + } else { +- if (s->option_pthread) ++ if (s->option_pthread) { + tcc_set_options(s, "-lpthread"); ++ n = s->nb_files; ++ } + } + + if (s->do_bench) diff --git a/debian/patches/series b/debian/patches/series index 5f5e7e2..5a658b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Disable-test-not-working-on-i386.patch 0002-Disable-stack-protector-in-runtime-library.patch 0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch +0004-Fix-pthread-option-handling.patch @@ -298,8 +298,10 @@ redo: if (n > 1 && s->outfile) tcc_error("cannot specify output file with -c many files"); } else { - if (s->option_pthread) + if (s->option_pthread) { tcc_set_options(s, "-lpthread"); + n = s->nb_files; + } } if (s->do_bench) |