sony-nicki: use armv7 (!143)

[skip ci]: this compiled in CI before, no need to run again.

device/device-sony-nicki/APKBUILD

@@ -5,7 +5,7 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-sony-nicki mkbootimg mesa-dri-swrast mdss-fb-init-hack msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -31,7 +31,7 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
-sha512sums="4cdebb8233c890241b7139f53daa950e58a866b61d9d5bdbb29d80818e1c5ee0d2a390e1df79606027aa79849518cc33d36adf508a0898e8d4603cd82dfe43fb  deviceinfo
+sha512sums="502ecbed9fc61887af0cd0569929ed03b1aad209b499c7ea3a1e86d667ecb270d512ec203da550acc89ac0a6ae444c93d2741118d5a4b601009a2ffef7a2e6a9  deviceinfo
 a3d3a0cf43c5f216279666143d6042f2669dbe3dc5ecec2817b6118a0c122f5b927799b37432bee3167359c118d0142fd8e8e8d67374e8ab1d837673f217e1ae  90-android-touch-dev.rules
 8cecfb3c726a59ebdf2a9e53df11e784d662329b50f288344121e7774368ee782c27229d94aee1f2f4d43eb6ef764ccb63af547beb43438b9750b2b888be61ff  screen-workaround.sh
 aac9a5d4c856b6feaf4f2961251fbc81d9173e24c3b20806e803711b40e388a173abf2651d5d828d36a504ef2de12c1c1eacea1f1b9479e31f55234012140405  fb.modes

device/device-sony-nicki/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="sony-nicki"
 deviceinfo_date=""
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"

device/linux-sony-nicki/APKBUILD

@@ -5,7 +5,7 @@ pkgname="linux-sony-nicki"
 pkgver=3.4.0
 pkgrel=2
 pkgdesc="Sony Xperia M kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="sony-nicki"
 url="https://kernel.org"
@@ -32,6 +32,7 @@ source="
 	05_try_to_make_kgsl_work.patch
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
+	kernel-use-the-gnu89-standard-explicitly.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
@@ -67,7 +68,7 @@ package() {
 }
 
 sha512sums="cb1132c1add4c87490889ca20924f92bc89d646b2efefe023802c22e0167a2cfd39fdcbf7316f957ba4c93fe7318079df8dea5657aac92710ddcd45bfa7977f8  linux-sony-nicki-627687e4625d208248fe5fa40dcaaeb3363dfce7.tar.gz
-935391d48e4880f76acb90525c2455c07e14b6e90c73c4334c735ac03e79de93e909705b3a3700443964594c8b06ea619f80271d2ea51e2590b567d78d780417  config-sony-nicki.armhf
+a8a5c8f8038ef82798bb6f8e5ef04198c4ef5ef04d4d25277f40eab874849a874ae66f9b7bb3935eaefef38124d4f26d9bdbcaef627f63c32cc948eeb6c5cdc9  config-sony-nicki.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd  01_fix_video_argb_setting.patch
 a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch
@@ -75,4 +76,5 @@ a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b082
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  04_psmouse_base.patch
 270aa134a7040409cf2ec5502939b8aa68470c47eeb2bef8f378aa2758a8b546b79018298a81625351f1c06241d8f76bf016793474f58b888db7871a5d745801  05_try_to_make_kgsl_work.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
-197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch"
+197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch"

device/linux-sony-nicki/kernel-use-the-gnu89-standard-explicitly.patch

@@ -0,0 +1,67 @@
+From 51b97e354ba9fce1890cf38ecc754aa49677fc89 Mon Sep 17 00:00:00 2001
+From: "Kirill A. Shutemov" <kirill@shutemov.name>
+Date: Mon, 20 Oct 2014 12:23:12 +0300
+Subject: kernel: use the gnu89 standard explicitly
+
+From: "Kirill A. Shutemov" <kirill@shutemov.name>
+
+commit 51b97e354ba9fce1890cf38ecc754aa49677fc89 upstream.
+
+Sasha Levin reports:
+ "gcc5 changes the default standard to c11, which makes kernel build
+  unhappy
+
+  Explicitly define the kernel standard to be gnu89 which should keep
+  everything working exactly like it was before gcc5"
+
+There are multiple small issues with the new default, but the biggest
+issue seems to be that the old - and very useful - GNU extension to
+allow a cast in front of an initializer has gone away.
+
+Patch updated by Kirill:
+ "I'm pretty sure all gcc versions you can build kernel with supports
+  -std=gnu89.  cc-option is redunrant.
+
+  We also need to adjust HOSTCFLAGS otherwise allmodconfig fails for me"
+
+Note by Andrew Pinski:
+ "Yes it was reported and both problems relating to this extension has
+  been added to gnu99 and gnu11.  Though there are other issues with the
+  kernel dealing with extern inline have different semantics between
+  gnu89 and gnu99/11"
+
+End result: we may be able to move up to a newer stdc model eventually,
+but right now the newer models have some annoying deficiencies, so the
+traditional "gnu89" model ends up being the preferred one.
+
+Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+Singed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Makefile |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -241,7 +241,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+ 
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
++HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
+ HOSTCXXFLAGS = -O2
+ 
+ # Decide whether to build built-in, modular, or both.
+@@ -373,7 +373,9 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstric
+ 		   -fno-strict-aliasing -fno-common \
+ 		   -Werror-implicit-function-declaration \
+ 		   -Wno-format-security \
+-		   -fno-delete-null-pointer-checks
++		   -fno-delete-null-pointer-checks \
++		   -std=gnu89
++
+ KBUILD_AFLAGS_KERNEL :=
+ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__