From: manish.r <manish.r@samsung.com>
Date: Tue, 6 Jul 2021 04:39:41 +0000 (+0530)
Subject: Modify cpu arch to armv7l for the case of armv8+32bit in capability
X-Git-Tag: submit/tizen/20210706.101746^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dde83ad250a08068d16cea0b44f34a497afeefa7;p=sdk%2Ftarget%2Fsdbd.git

Modify cpu arch to armv7l for the case of armv8+32bit in capability

Change-Id: I5eb5d88426ce0ee46555c1fb58faaca1e1aa2a85
Signed-off-by: manish.r <manish.r@samsung.com>
---

diff --git a/src/sdb.c b/src/sdb.c
index 844ac49..4e1e67d 100755
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -1745,6 +1745,11 @@ static void init_capabilities(void) {
 
     memset(&g_capabilities, 0, sizeof(g_capabilities));
 
+    // architecture support
+    char* arch = get_platfrom_architecture();
+    snprintf(g_capabilities.architecture, sizeof(g_capabilities.architecture),
+             "%s", arch);
+
     // CPU Architecture of model
     ret = system_info_get_platform_string("http://tizen.org/feature/platform.core.cpu.arch", &value);
     if (ret != SYSTEM_INFO_ERROR_NONE) {
@@ -1752,8 +1757,16 @@ static void init_capabilities(void) {
                     "%s", UNKNOWN);
         E("fail to get the CPU architecture of model:%d\n", errno);
     } else {
-        snprintf(g_capabilities.cpu_arch, sizeof(g_capabilities.cpu_arch),
-                    "%s", value);
+        // check for armv8 and 32 bit architecture, for it make the cpu arch as armv7l
+        if(!strncmp(value,"armv8",sizeof("armv8")+1) && !strncmp(arch,"32",sizeof("32")+1))
+        {
+            D("Changing cpu arch in capability from %s to %s for %s bit\n",value,"armv7l",arch);
+            snprintf(g_capabilities.cpu_arch, sizeof(g_capabilities.cpu_arch),
+                                            "%s", "armv7l");
+        } else {
+            snprintf(g_capabilities.cpu_arch, sizeof(g_capabilities.cpu_arch),
+                                "%s", value);
+        }
         if (value != NULL) {
             free(value);
         }
@@ -1992,10 +2005,6 @@ static void init_capabilities(void) {
     snprintf(g_capabilities.netcoredbg_support, sizeof(g_capabilities.netcoredbg_support),
              "%s", ret == 1 ? ENABLED : DISABLED);
 
-    // architecture support
-    snprintf(g_capabilities.architecture, sizeof(g_capabilities.architecture),
-             "%s", get_platfrom_architecture());
-
     // Capability version
     snprintf(g_capabilities.sdbd_cap_version, sizeof(g_capabilities.sdbd_cap_version),
                 "%d.%d", SDBD_CAP_VERSION_MAJOR, SDBD_CAP_VERSION_MINOR);