From 298672fe6bfae933dc16d2472eaf1eeb38eb2c54 Mon Sep 17 00:00:00 2001
From: JunsuChoi <jsuya.choi@samsung.com>
Date: Tue, 11 Jun 2024 16:43:59 +0900
Subject: [PATCH] Support x86 build

---
 .github/workflows/build.yml  | 8 +++++++-
 ci/tizen/generate_sysroot.py | 8 +++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0a75291e67f2..5cae3d3ead4b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        arch: [arm, arm64, x86]
+        arch: [arm, arm64, x86, x64]
         mode: [debug, release, profile]
         include:
           - arch: arm
@@ -22,11 +22,17 @@ jobs:
             triple: aarch64-linux-gnu
           - arch: x86
             triple: i686-linux-gnu
+          - arch: x64
+            triple: x86_64-linux-gnu
         exclude:
           - arch: x86
             mode: release
           - arch: x86
             mode: profile
+          - arch: x64
+            mode: release
+          - arch: x64
+            mode: profile
 
     steps:
       - uses: actions/checkout@v4
diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py
index c40bc6a449eb7..b1e5702919346 100755
--- a/ci/tizen/generate_sysroot.py
+++ b/ci/tizen/generate_sysroot.py
@@ -37,6 +37,8 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
     tizen_arch = 'aarch64'
   elif arch == 'x86':
     tizen_arch = 'i686'
+  elif arch == 'x64':
+    tizen_arch = 'x86_64'
   else:
     sys.exit('Unknown arch: ' + arch)
 
@@ -90,11 +92,11 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
   if not asm.exists():
     os.symlink('asm-' + arch, asm)
   pkgconfig = sysroot / 'usr' / 'lib' / 'pkgconfig'
-  if arch == 'arm64' and not pkgconfig.exists():
+  if (arch == 'arm64' or arch == 'x64') and not pkgconfig.exists():
     os.symlink('../lib64/pkgconfig', pkgconfig)
 
   # Copy objects required by the linker, such as crtbeginS.o and libgcc.a.
-  if arch == 'arm64':
+  if arch == 'arm64' or arch == 'x64':
     libpath = sysroot / 'usr' / 'lib64'
   else:
     libpath = sysroot / 'usr' / 'lib'
@@ -134,7 +136,7 @@ def main():
     outpath = Path(__file__).parent / 'sysroot'
   outpath.mkdir(exist_ok=True)
 
-  for arch in ['arm', 'arm64', 'x86']:
+  for arch in ['arm', 'arm64', 'x86', 'x64']:
     sysroot = outpath / arch
     if args.force and sysroot.is_dir():
       shutil.rmtree(sysroot)