Update build-config for common branch from OBS

Change-Id: Iba11ea0ac11a9ee03603d6da667cb46054c617b5
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>

diff --git a/build-arm-wayland.conf b/build-arm-wayland.conf
index d782461ced6f1ef8e4fa28d43d51c2f5bd96d226..98a63553806576b3cb429c073c0cfe9ca8645514 100644 (file)
--- a/build-arm-wayland.conf
+++ b/build-arm-wayland.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-arm-x11.conf b/build-arm-x11.conf
index a93b9622b32a05143d67ab19c03209f6819261fe..0b0fe33bad611b8210876330a00d4d718153a538 100644 (file)
--- a/build-arm-x11.conf
+++ b/build-arm-x11.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-arm64-wayland.conf b/build-arm64-wayland.conf
index 074a9940a38a3208b3f9bccafcd822aaa7093b37..d33d47cc7ae7a1aa6c13d22856db7e4f9def9029 100644 (file)
--- a/build-arm64-wayland.conf
+++ b/build-arm64-wayland.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-arm64-x11.conf b/build-arm64-x11.conf
index cd9353e090b182d14b9331ec1949991e0968c7f9..38745dbee258991ab8bd6c71885684b671bbfac6 100644 (file)
--- a/build-arm64-x11.conf
+++ b/build-arm64-x11.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-emulator32-wayland.conf b/build-emulator32-wayland.conf
index 1eb5c5d0baeab6f443058f658c4042014cf57e26..ed61d8c20db1ffa22bb8c8de3da15308fb2d2388 100644 (file)
--- a/build-emulator32-wayland.conf
+++ b/build-emulator32-wayland.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-ia32-wayland.conf b/build-ia32-wayland.conf
index 3515942a6e8c30cc62a3f29b81f2ca0e4c352163..4795e3a8dd99dbe5039d0ede74ad4873b9efa949 100644 (file)
--- a/build-ia32-wayland.conf
+++ b/build-ia32-wayland.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-ia32-x11.conf b/build-ia32-x11.conf
index 4ed9f7f1c58cd75041d4b6f964f31eb7ec91f5f2..28c41417ff217769f3838903a9560e8ef8848680 100644 (file)
--- a/build-ia32-x11.conf
+++ b/build-ia32-x11.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-x86_64-wayland.conf b/build-x86_64-wayland.conf
index 0138f4b39b3d133fc2b98b4410992955a63d83e8..f1e7666ce5ede3f56ba8d9308f27d250b1d5ffa8 100644 (file)
--- a/build-x86_64-wayland.conf
+++ b/build-x86_64-wayland.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-x86_64-x11.conf b/build-x86_64-x11.conf
index 33c59f0c09ad81a0be56f8951feadc13ef1b6e95..d35c427b81a21b4f822f615b4d46615b54a97261 100644 (file)
--- a/build-x86_64-x11.conf
+++ b/build-x86_64-x11.conf
@@ -34,13 +34,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
-%ifarch x86_64
-Support: glibc-32bit
-%endif
-%endif
-
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -450,4 +443,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags}
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto