From 1ad76090c04cca1f0a24ec13d18baab143c4f963 Mon Sep 17 00:00:00 2001
From: mulingLHY <1243592635@qq.com>
Date: Sun, 14 Jan 2024 10:40:03 +0800
Subject: [PATCH] linux-xiaomi-kenzo: fix kernel-compile error by remove
 Sun-Solaris style flag (MR 4715)

[ci:skip-build]: Already built successfully in CI.
---
 ...64-remove-Sun-Solaris-style-flag-on-section.patch | 12 ++++++++++++
 device/testing/linux-xiaomi-kenzo/APKBUILD           | 10 +++++++---
 ...64-remove-Sun-Solaris-style-flag-on-section.patch |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 device/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 create mode 120000 device/testing/linux-xiaomi-kenzo/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

diff --git a/device/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch b/device/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
new file mode 100644
index 000000000..b20adc27a
--- /dev/null
+++ b/device/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index d2f2cedf..7e2cbc74 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -171,7 +171,6 @@ ENTRY(cpu_do_switch_mm)
+ 	ret
+ ENDPROC(cpu_do_switch_mm)
+ 
+-	.section ".text.init", #alloc, #execinstr
+ 
+ /*
+  *	__cpu_setup
diff --git a/device/testing/linux-xiaomi-kenzo/APKBUILD b/device/testing/linux-xiaomi-kenzo/APKBUILD
index 61507f561..c0f1bc92b 100644
--- a/device/testing/linux-xiaomi-kenzo/APKBUILD
+++ b/device/testing/linux-xiaomi-kenzo/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-xiaomi-kenzo
 pkgver=3.10.105
-pkgrel=3
+pkgrel=4
 pkgdesc="Xiaomi Redmi Note 3 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -30,6 +30,7 @@ source="
 	01_fix_gcc6_errors.patch
 	02_fix_msm_dba.patch
 	gcc10-extern_YYLOC_global_declaration.patch
+	linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 
@@ -53,8 +54,11 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="c2d57468544d9b96e7f55d8358419fecdbbb75ae02e08fb3e008a882750855966d989a79e058888bcdd5542f322fd26ac217cd73c316768183b496f108089b43  linux-xiaomi-kenzo-92430f1a110b9b49e69fb1d3bde81c0f048d0282.tar.gz
+sha512sums="
+c2d57468544d9b96e7f55d8358419fecdbbb75ae02e08fb3e008a882750855966d989a79e058888bcdd5542f322fd26ac217cd73c316768183b496f108089b43  linux-xiaomi-kenzo-92430f1a110b9b49e69fb1d3bde81c0f048d0282.tar.gz
 412fd5ab87a01b5a525f4bb31c6541c27c95ed81dbc889a49d15a75493b43114b77db265ce8bede25e094fe0e7deb551edb741b99255441a0e5278f2f608b7de  config-xiaomi-kenzo.aarch64
 972e98523d6ef06342e69a09e979bdd86904cf7f9a843b519b37791e531b680182564a2ab537c94629c3589f4e775b2c39de04c64e210a0f8b6f10745c3596f1  01_fix_gcc6_errors.patch
 7e765cb696fa8c3dfbc305b05cbf1fad85fb9572613d5391e945341dae5974a745f4906c795dc841e5562b19ab77d5257f9741e514af2c2573aa4bb8b262ce51  02_fix_msm_dba.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6  linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
+"
diff --git a/device/testing/linux-xiaomi-kenzo/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch b/device/testing/linux-xiaomi-kenzo/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
new file mode 120000
index 000000000..f61312e32
--- /dev/null
+++ b/device/testing/linux-xiaomi-kenzo/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
\ No newline at end of file