Merge pull request #113 from nwnk/armv7hl

Fixes for armv7.

Fix build failures for the ARMv7 stubs that show up on some compiler versions.

configure.ac

@@ -91,7 +91,7 @@ if test "x$enable_asm" = xyes; then
             ;;
         esac
         ;;
-    armv7l)
+    armv7*l)
         asm_arch=armv7l
         ;;
     aarch64)
@@ -117,7 +117,7 @@ if test "x$enable_asm" = xyes; then
         AC_MSG_RESULT([yes, aarch64])
         ;;
     *)
-        AC_MSG_RESULT([no, platform not supported])
+        AC_MSG_RESULT([no, platform '$host_cpu' not supported])
         ;;
     esac
 fi

src/GLdispatch/vnd-glapi/entry_armv7_tsd.c

@@ -140,6 +140,7 @@ static uint16_t BYTECODE_TEMPLATE[] =
 
 __asm__(".section wtext,\"ax\"\n"
         ".balign 4096\n"
+        ".syntax unified\n"
        ".globl public_entry_start\n"
        ".hidden public_entry_start\n"
         "public_entry_start:\n");
@@ -148,6 +149,7 @@ __asm__(".section wtext,\"ax\"\n"
 #include "mapi_tmp.h"
 
 __asm__(".balign 4096\n"
+        ".syntax divided\n"
        ".globl public_entry_end\n"
        ".hidden public_entry_end\n"
         "public_entry_end:\n"
@@ -166,7 +168,6 @@ const int entry_stub_size = ARMV7_ENTRY_SIZE;
 static const int TEMPLATE_OFFSET_CURRENT_TABLE     = ARMV7_BYTECODE_SIZE - 3*4;
 static const int TEMPLATE_OFFSET_CURRENT_TABLE_GET = ARMV7_BYTECODE_SIZE - 2*4;
 static const int TEMPLATE_OFFSET_SLOT              = ARMV7_BYTECODE_SIZE - 4;
-static const int TEMPLATE_OFFSETS_SIZE             = 3*4;
 
 void
 entry_init_public(void)

tests/dummy/EGL_dummy.c

@@ -56,7 +56,6 @@ static const char *PLATFORM_EXTENSIONS =
     ;
 
 static const char *DISPLAY_EXTENSIONS = "";
-static const EGLint DUMMY_EGL_CONFIG_COUNT = 2;
 
 typedef struct DummyEGLDisplayRec {
     EGLenum platform;