From bc043005915b2c28169e37c2b8b7ccfeefc2c920 Mon Sep 17 00:00:00 2001
From: chfl4gs <55137784+chfl4gs@users.noreply.github.com>
Date: Sun, 26 Apr 2020 17:52:22 +0800
Subject: [PATCH 1/3] Travis-CI - Cmake (#1241)

* Travis-CI Migration (#1230)

* Travis-CI Migration

* Travis-CI addition cmake Linux
---
 .travis.yml | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af5006dd..e387b872 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,9 @@ matrix:
     - name: "Linux 32bit"
       os: linux
       compiler: gcc
-      env: CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
+      env: 
+        - CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
+        - PATH=$PATH:/usr/local/opt/binutils/bin
       script: make && make -C tests/unit test && make -C tests/regress test
       addons:
         apt:
@@ -37,6 +39,35 @@ matrix:
             - gcc-multilib
             - libcmocka-dev:i386
 
+    - name: "Linux Cmake 32bit"
+      os: linux
+      compiler: gcc
+      env: 
+        - CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
+        - PATH=$PATH:/usr/local/opt/binutils/bin
+      script:
+        - ./cmake.sh x86 
+        - make -C tests/unit test && make -C tests/regress test
+      addons:
+        apt:
+          packages:
+            - lib32ncurses5-dev
+            - lib32z1-dev
+            - libpthread-stubs0-dev
+            - lib32gcc-4.8-dev
+            - libc6-dev-i386
+            - gcc-multilib
+            - libcmocka-dev:i386
+
+    - name: "Linux Cmake 64bit"
+      os: linux
+      compiler: gcc
+      env:
+        - PATH=$PATH:/usr/local/opt/binutils/bin
+      script:
+        - ./cmake.sh
+        - make -C tests/unit test && make tests/regress test
+
     - name: "MacOSX brew"
       os: osx
       osx_image: xcode10.1

From c5adcad5a2da80034d212cf36fce65437c95fe12 Mon Sep 17 00:00:00 2001
From: chfl4gs <55137784+chfl4gs@users.noreply.github.com>
Date: Mon, 27 Apr 2020 00:01:39 +0800
Subject: [PATCH 2/3] fix travis-ci cmake path (#1242)

* Travis-CI Migration (#1230)

* Travis-CI Migration

* Travis-CI addition cmake Linux

* Travis-CI cmake fix
---
 .travis.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e387b872..51665054 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,11 @@ matrix:
         - CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
         - PATH=$PATH:/usr/local/opt/binutils/bin
       script:
-        - ./cmake.sh x86 
-        - make -C tests/unit test && make -C tests/regress test
+        - mkdir build
+        - cd build
+        - ../cmake.sh x86
+        - cp libunicorn.* ../
+        - make -C ../tests/unit test && make -C ../tests/regress test
       addons:
         apt:
           packages:
@@ -65,8 +68,11 @@ matrix:
       env:
         - PATH=$PATH:/usr/local/opt/binutils/bin
       script:
-        - ./cmake.sh
-        - make -C tests/unit test && make tests/regress test
+        - mkdir build
+        - cd build
+        - ../cmake.sh
+        - cp libunicorn.* ../
+        - make -C ../tests/unit test && make -C ../tests/regress test
 
     - name: "MacOSX brew"
       os: osx

From cc5bfbc8440b176e7254181d2967771e736fd830 Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Mon, 27 Apr 2020 01:31:39 +0800
Subject: [PATCH 3/3] delete unused file i386-softmmu.mak

---
 qemu/default-configs/i386-softmmu.mak | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 qemu/default-configs/i386-softmmu.mak

diff --git a/qemu/default-configs/i386-softmmu.mak b/qemu/default-configs/i386-softmmu.mak
deleted file mode 100644
index 558b60d5..00000000
--- a/qemu/default-configs/i386-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for i386-softmmu
-
-CONFIG_APIC=y