From 091496f74dca4dfd689909c5ce5559fd46dbbff7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 18 May 2016 22:09:01 +0200
Subject: [PATCH] Add ARMv7 entry too

---
 frontend/drivers/platform_darwin.m | 5 ++++-
 frontend/drivers/platform_linux.c  | 1 +
 frontend/drivers/platform_psp.c    | 2 +-
 frontend/frontend_driver.h         | 1 +
 menu/menu_displaylist.c            | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index d38fc6f775..996e1a5bf7 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -622,9 +622,12 @@ static enum frontend_architecture frontend_darwin_get_architecture(void)
       case DARWIN_ARCH_POWER_MAC:
         return FRONTEND_ARCH_PPC;
    }
-#endif
 
    return FRONTEND_ARCH_NONE;
+#else
+   /* TODO/FIXME - make this more flexible */
+   return FRONTEND_ARCH_ARMV7;
+#endif
 }
 
 static int frontend_darwin_parse_drive_list(void *data)
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index cbd8baf62d..1f517ae5fb 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1126,6 +1126,7 @@ static enum frontend_architecture frontend_linux_get_architecture(void)
    {
       case LINUX_ARCH_ARMV7L:
       case LINUX_ARCH_ARMV7B:
+         return FRONTEND_ARCH_ARMV7;
       case LINUX_ARCH_ARMV6L:
       case LINUX_ARCH_ARMV6B:
       case LINUX_ARCH_ARMV5TEB:
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 2b796f691d..cbbf177e78 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -359,7 +359,7 @@ static enum frontend_powerstate frontend_psp_get_powerstate(int *seconds, int *p
 enum frontend_architecture frontend_psp_get_architecture(void)
 {
 #ifdef VITA
-   return FRONTEND_ARCH_ARM;
+   return FRONTEND_ARCH_ARMV7;
 #else
    return FRONTEND_ARCH_MIPS;
 #endif
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index e706b11fdc..9fc7c9ca5a 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -53,6 +53,7 @@ enum frontend_architecture
    FRONTEND_ARCH_X86_64,
    FRONTEND_ARCH_PPC,
    FRONTEND_ARCH_ARM,
+   FRONTEND_ARCH_ARMV7,
    FRONTEND_ARCH_MIPS,
    FRONTEND_ARCH_TILE
 };
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 5c63a8126f..847138ee66 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -672,6 +672,9 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          case FRONTEND_ARCH_ARM:
             strlcpy(cpu_arch_str, "ARM", sizeof(cpu_arch_str));
             break;
+         case FRONTEND_ARCH_ARMV7:
+            strlcpy(cpu_arch_str, "ARMv7", sizeof(cpu_arch_str));
+            break;
          case FRONTEND_ARCH_MIPS:
             strlcpy(cpu_arch_str, "MIPS", sizeof(cpu_arch_str));
             break;