1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/gfx/cairo/pixman-android-cpu-detect.patch Wed Dec 31 06:09:35 2014 +0100 1.3 @@ -0,0 +1,29 @@ 1.4 +diff --git a/gfx/cairo/libpixman/src/pixman-cpu.c b/gfx/cairo/libpixman/src/pixman-cpu.c 1.5 +--- a/gfx/cairo/libpixman/src/pixman-cpu.c 1.6 ++++ b/gfx/cairo/libpixman/src/pixman-cpu.c 1.7 +@@ -257,19 +257,22 @@ pixman_arm_read_auxv() 1.8 + arm_tests_initialized = TRUE; 1.9 + return; 1.10 + } 1.11 + 1.12 + fread(buf, sizeof(char), 1024, f); 1.13 + fclose(f); 1.14 + pos = strstr(buf, ver_token); 1.15 + if (pos) { 1.16 +- int ver = *(pos + strlen(ver_token)) - '0'; 1.17 +- arm_has_v7 = ver >= 7; 1.18 +- arm_has_v6 = ver >= 6; 1.19 ++ char vchar = *(pos + strlen(ver_token)); 1.20 ++ if (vchar >= '0' && vchar <= '9') { 1.21 ++ int ver = vchar - '0'; 1.22 ++ arm_has_v7 = ver >= 7; 1.23 ++ arm_has_v6 = ver >= 6; 1.24 ++ } 1.25 + } 1.26 + arm_has_neon = strstr(buf, "neon") != NULL; 1.27 + arm_has_vfp = strstr(buf, "vfp") != NULL; 1.28 + arm_has_iwmmxt = strstr(buf, "iwmmxt") != NULL; 1.29 + arm_tests_initialized = TRUE; 1.30 + } 1.31 + 1.32 + #else