From c2da6cbd25101cba9ae31a8fdebc253a61ff79cc Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 18 Nov 2016 18:49:17 +0000 Subject: Remove setting an env-var to force disable Altivec in libjpeg-turbo a) v1.5.1 has Altivec off by default when built for OS4 b) I've moved my detection code into libjpeg-turbo, so the env-var will now *only* be an override --- frontends/amiga/dist/Install | 10 ---------- frontends/amiga/gui.c | 23 ----------------------- 2 files changed, 33 deletions(-) diff --git a/frontends/amiga/dist/Install b/frontends/amiga/dist/Install index dd4eb5149..b33b36c7b 100755 --- a/frontends/amiga/dist/Install +++ b/frontends/amiga/dist/Install @@ -289,16 +289,6 @@ (complete 75) -; Force disable use of AltiVec if we don't have it -(if (database "vectorunit" "0") - ( - (textfile - (dest "ENVARC:JSIMD_FORCENONE") - (append "1") - ) - ) -) - (if (= (exists "ENVARC:Sys/def_css.info") 0) (copyfiles (prompt "Copying default CSS icon") diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index fdbced232..459e768e1 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -5542,29 +5542,6 @@ int main(int argc, char** argv) /* Open splash window */ Object *splash_window = ami_gui_splash_open(); -#ifdef __amigaos4__ - /* Check for AltiVec */ - uint32 altivec = 0; - - GetCPUInfoTags(GCIT_VectorUnit, &altivec, TAG_DONE); - - if(altivec == VECTORTYPE_ALTIVEC) { - LOG("AltiVec detected"); - } else { - char jsimd_forcenone[10]; - - LOG("AltiVec NOT detected"); - int32 len = GetVar("JSIMD_FORCENONE", jsimd_forcenone, 10, GVF_GLOBAL_ONLY); - - if(len == -1) { - LOG("WARNING: JSIMD_FORCENONE NOT SET"); - SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY | GVF_SAVE_VAR); - } else { - LOG("JSIMD_FORCENONE = %s (NB: Should be '1' for this architecture)", jsimd_forcenone); - } - } -#endif - ami_object_init(); if (ami_open_resources() == false) { /* alloc message ports */ -- cgit v1.2.3