pixman: Branch 'master'

[Siarhei Siamashka]

 pixman/pixman-cpu.c |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit cf1f034fef34478c528bedf1e59be443fa72429c
Author: Siarhei Siamashka <siarhei.siamashka at nokia.com>
Date:   Sun Feb 7 07:33:52 2010 +0200

    ARM: Remove any use of environment variables for cpu features detection
    
    Old code assumed that all ARMv7 processors support NEON instructions
    unless overrided by environment variable ARM_TRUST_HWCAP. This causes
    X server to die with SIGILL if NEON support is disabled in the kernel
    configuration. Additionally, ARMv7 processors lacking NEON unit are
    going to become available eventually.
    
    The problem was reported by user bearsh at irc.freenode.net #gentoo-embedded

diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
index 5d5469b..d727ddb 100644
--- a/pixman/pixman-cpu.c
+++ b/pixman/pixman-cpu.c
@@ -253,8 +253,6 @@ pixman_arm_read_auxv ()
 	    if (aux.a_type == AT_HWCAP)
 	    {
 		uint32_t hwcap = aux.a_un.a_val;
-		if (getenv ("ARM_FORCE_HWCAP"))
-		    hwcap = strtoul (getenv ("ARM_FORCE_HWCAP"), NULL, 0);
 		/* hardcode these values to avoid depending on specific
 		 * versions of the hwcap header, e.g. HWCAP_NEON
 		 */
@@ -266,8 +264,6 @@ pixman_arm_read_auxv ()
 	    else if (aux.a_type == AT_PLATFORM)
 	    {
 		const char *plat = (const char*) aux.a_un.a_val;
-		if (getenv ("ARM_FORCE_PLATFORM"))
-		    plat = getenv ("ARM_FORCE_PLATFORM");
 		if (strncmp (plat, "v7l", 3) == 0)
 		{
 		    arm_has_v7 = TRUE;
@@ -280,12 +276,6 @@ pixman_arm_read_auxv ()
 	    }
 	}
 	close (fd);
-
-	/* if we don't have 2.6.29, we have to do this hack; set
-	 * the env var to trust HWCAP.
-	 */
-	if (!getenv ("ARM_TRUST_HWCAP") && arm_has_v7)
-	    arm_has_neon = TRUE;
     }
 
     arm_tests_initialized = TRUE;