[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6613-g0a46bdf
Michael Tautschnig
mt at debian.org
Mon Nov 1 20:04:48 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 0a46bdf006d23248a34c999e4b8f45cee5d02024
Author: Michael Tautschnig <mt at debian.org>
Date: Mon Nov 1 21:03:51 2010 +0100
Don't disable the JIT on pentium4 (bb #2345).
startup bytecode was checking for 'pentium' as substring, not as string,
and matched on pentium4, when it shouldn't have.
Conflicts:
ChangeLog
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --git a/ChangeLog b/ChangeLog
index aaccde8..e79a3db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 31 09:13:33 EET 2010 (edwin)
+------------------------------------
+ * libclamav/builtin_bytecodes.h: Don't disable JIT on pentium4 (bb #2345)
+
Mon Oct 25 18:02:56 CEST 2010 (tk)
----------------------------------
* V 0.96.4
diff --git a/debian/changelog b/debian/changelog
index 2dc56cc..6783ab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ clamav (0.96.4+dfsg-2) UNRELEASED; urgency=low
[ Michael Tautschnig ]
* Forcibly remove files in purge even if ucf is not available (anymore) -
thanks piuparts.
+ * Cherry pick 89e80e83a8c256e15821b6558b5ed7fc9e65f4b5 from upstream git to
+ fix CPU detection for LLVM JIT - JIT will now be correctly enabled on
+ Pentium IV - fixes FTBFS due to test failures. Thanks Scott for pointing
+ this out.
- -- Michael Tautschnig <mt at debian.org> Sat, 30 Oct 2010 23:11:09 +0200
+ -- Michael Tautschnig <mt at debian.org> Mon, 01 Nov 2010 21:03:41 +0100
clamav (0.96.4+dfsg-1) unstable; urgency=low
diff --git a/libclamav/builtin_bytecodes.h b/libclamav/builtin_bytecodes.h
index 9ad28d9..3b21bbb 100644
--- a/libclamav/builtin_bytecodes.h
+++ b/libclamav/builtin_bytecodes.h
@@ -29,7 +29,7 @@
* fallback.
* Usually bytecode.cvd will contain this bytecode */
-static const char* builtin_bc_startup = "ClamBCafhmknalkld|afefdfggifnf```aa```|biacflfafmfbfcfmb`cnbacacmbacgcgcmbgfbffcbficbfbfac``bgcaap`clamcoincidencejb:4096\n"
+static const char* builtin_bc_startup = "ClamBCafhiifamlld|afefdfggifnf```aa```|biacflfafmfbfcfmb`cnbacacmbacgchcmbgfbcbfgcfffcffec``bgcaap`clamcoincidencejb:4096\n"
"\n"
"Teddaaahdabahdacahdadahdaeahdafahdagahebfgebidebegebdgebgdebkdebcgebbgebageb`gebofebnfebmfebedeblfebkfebjfebadcbgab`bb`bb`bb`bb`bb`bb`bbifbifbifbifbifbifbifahahahahahahahahahebneebifaaaaaaaab`baabb`bb`baacb`bbadb`baacb`bboeb`baacb`bb`bb`baadb`bbadb`bb`baadb`bbadbadb`bdbadahdbkaahdbbcahdbibahdb`eahdbddahdbodahdbdaahdaiahdakahdamahdahahdbgcahdbnbah\n"
"Ebjdaibcdbbf|bcaefnfgfifnfefoedfcfofnfffoelfeffgeflf``bbdbbf|bkaefnfgfifnfefoeffegnfcfdgifofnfaflfifdgigoelfeffgeflf``agbcf|baadfefbfeggfoe`gbgifnfdgoeegifnfdg``bcabcf|afdgefcgdgbc``afbdf|b`adfefbfeggfoe`gbgifnfdgoecgdgbg``bhdbef|b`agfefdgoeefnffgifbgofnfmfefnfdg``aabff|afdgefcgdgac``bidbgf|bdadfifcgafbflfefoebfigdgefcfofdfefoeifff``bjdbgf|aodfifcgafbflfefoejfifdgoeifff``\n"
@@ -37,19 +37,19 @@ static const char* builtin_bc_startup = "ClamBCafhmknalkld|afefdfggifnf```aa```|
"A`b`bLbjib`bab`bab`babneab`b`bad`ah`aa`bad`ah`aa`b`f`bad`b`b`aa`b`b`aa`b`b`b`b`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`aa`b`b`b`b`bad`ah`b`b`b`b`aa`b`b`bad`ah`aa`ah`b`b`b`b`aa`b`b`b`b`aa`b`b`b`b`bad`ah`aa`bad`ah`aa`b`b`aa`b`b`b`b`aa`aa`aa`aa`aa`b`b`b`b`b`b`ah`aa`bcd`b`b`aa`bcd`b`b`bcd`b`b`aa`b`b`aa`b`b`b`b`aa`bad`ah`b`b`aa`b`b`aa`bad`ah`b`b`b`b`bad`ah`b`b`b`b`bad`ah`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`bad`ah`b`b`b`b`bcd`b`b`b`b`b`b`bad`ah`b`b`b`b`bcd`b`b`b`b`bcd`b`b`aa`b`b`bcd`b`b`aa`b`b`bcd`b`b`aa`b`b`b`b`aa`b`b`b`b`aa`b`b`b`b`Fbombdc\n"
"Bb`badabbbhdacClnadbadaedbboeacBdadahafgbaeaaageaahaf at aTaaagbkaaa\n"
"BbadahdbboeacB`adahaigbahaaajeaahaiAaaTaaajabb`a\n"
-"Bb`fakdbboeacAidbadaldbb`fak at db`bamkbalBja`Addaaaneab`bam at db`b`bbAadabTaaanadac\n"
-"Bb`baokbalBka`Addaab`aeab`bao at db`bab`ab`ab`b`bbababTbaad\n"
-"Bb`bbaabbabbaab`bbbaabcbjdBia`@dbaab`bbcakbalBma`Addaabdaeab`bbca at db`b`bbAadaaTaabdaaoae\n"
-"Bb`bbeakbalBna`Agdaabfaeab`bbea at db`b`bbAadaaTaabfaaoaf\n"
-"Bb`bbgakbalBoa`Addaabhaeab`bbga at db`b`bbAadaaTaabhaaoag\n"
-"Bb`bbiakbalB`b`Abdaabjaeab`bbia at db`b`bbAadaaTaabjaaoah\n"
-"Bb`bbkakbalBab`Addaablaeab`bbka at db`b`bbAadaaTaablaaoai\n"
-"Bb`bbmakbalBbb`Addaabnaeab`bbma at db`b`bbAadaaTaabnaaoaj\n"
-"Bb`bboakbalBcb`Afdaab`beab`bboa at db`b`bbAadaaTaab`baoak\n"
-"Bb`bbabkbalBdb`Aldaabbbeab`bbab at db`b`bbAadaaTaabbbaoal\n"
-"Bb`bbcbkbalBeb`Ajdaabdbeab`bbcb at db`b`bbAadaaTaabdbaoam\n"
-"Bb`bbebkbalBfb`Ahdaabfbeab`bbeb at db`b`bbAadaaTaabfbaoan\n"
-"Bb`bbgbkbalBgb`Abdaabhbeab`bbgb at db`baa`abhbb`b`bbaaaaTbaao\n"
+"Bb`fakdbboeacAidbadaldbb`fak at db`bamkbalBja`Aedaaaneab`bam at db`b`bbAadabTaaanadac\n"
+"Bb`baokbalBka`Aedaab`aeab`bao at db`bab`ab`ab`b`bbababTbaad\n"
+"Bb`bbaabbabbaab`bbbaabcbjdBia`@dbaab`bbcakbalBma`Aedaabdaeab`bbca at db`b`bbAadaaTaabdaaoae\n"
+"Bb`bbeakbalBna`Ahdaabfaeab`bbea at db`b`bbAadaaTaabfaaoaf\n"
+"Bb`bbgakbalBoa`Aedaabhaeab`bbga at db`b`bbAadaaTaabhaaoag\n"
+"Bb`bbiakbalB`b`Acdaabjaeab`bbia at db`b`bbAadaaTaabjaaoah\n"
+"Bb`bbkakbalBab`Aedaablaeab`bbka at db`b`bbAadaaTaablaaoai\n"
+"Bb`bbmakbalBbb`Aedaabnaeab`bbma at db`b`bbAadaaTaabnaaoaj\n"
+"Bb`bboakbalBcb`Agdaab`beab`bboa at db`b`bbAadaaTaab`baoak\n"
+"Bb`bbabkbalBdb`Amdaabbbeab`bbab at db`b`bbAadaaTaabbbaoal\n"
+"Bb`bbcbkbalBeb`Akdaabdbeab`bbcb at db`b`bbAadaaTaabdbaoam\n"
+"Bb`bbebkbalBfb`Aidaabfbeab`bbeb at db`b`bbAadaaTaabfbaoan\n"
+"Bb`bbgbkbalBgb`Acdaabhbeab`bbgb at db`baa`abhbb`b`bbaaaaTbaao\n"
"Bb`bbibbbaabibb`bbjbabcbjdBla`@dbibTbab`a\n"
"BbadbkbdbboeacBeadahblbgbbkbb`bbmb`ablbb`bbnbk`bmbAadaabobeab`bbnb at dTaabobbaabga\n"
"Bb`bb`cabcbjdBhb`@dAadbadbacdbboeacBaadahbbcgbbacaabcceaahbbcAjaTaabccbbabka\n"
@@ -106,23 +106,23 @@ int entrypoint()
switch (env.arch) {
case arch_i386:
disable_jit_if("i[34]86 detected, JIT needs pentium or better",0,
- !memcmp(env.cpu,"i386",4) ||
- !memcmp(env.cpu,"i486",4));
+ !memcmp(env.cpu,"i386",5) ||
+ !memcmp(env.cpu,"i486",5));
/* FIXME: update embedded LLVM to 2.8 which correctly skips CMOV if CPU
* doesn't support it.
* For now disable JIT on CPUs without cmov */
disable_jit_if("CPU doesn't support CMOV, would need LLVM 2.8 to work!",0,
- !memcmp(env.cpu,"i586",4) ||
- !memcmp(env.cpu,"pentium",7) ||
- !memcmp(env.cpu,"i686",4) ||
- !memcmp(env.cpu,"k6",2) ||
- !memcmp(env.cpu,"k6-2",4) ||
- !memcmp(env.cpu,"k6-3",4) ||
- !memcmp(env.cpu,"athlon",6) ||
- !memcmp(env.cpu,"athlon-tbird",12) ||
- !memcmp(env.cpu,"winchip-c6",10) ||
- !memcmp(env.cpu,"winchip2",8) ||
- !memcmp(env.cpu,"c3",2));
+ !memcmp(env.cpu,"i586",5) ||
+ !memcmp(env.cpu,"pentium",8) ||
+ !memcmp(env.cpu,"i686",5) ||
+ !memcmp(env.cpu,"k6",3) ||
+ !memcmp(env.cpu,"k6-2",5) ||
+ !memcmp(env.cpu,"k6-3",5) ||
+ !memcmp(env.cpu,"athlon",7) ||
+ !memcmp(env.cpu,"athlon-tbird",13) ||
+ !memcmp(env.cpu,"winchip-c6",11) ||
+ !memcmp(env.cpu,"winchip2",9) ||
+ !memcmp(env.cpu,"c3",3));
break;
default:
break;
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list