From 3d99fad4828f48533d6e39ecd7087c032e9adbb7 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 5 Oct 2018 08:08:58 +0200 Subject: [PATCH] linux-lg-mako: modernize with new gcc8 linux aportgen code --- device/linux-lg-mako/APKBUILD | 57 ++++++++------- device/linux-lg-mako/compiler-gcc6.h | 69 ------------------- ...give-up-on-ilog2-const-optimizations.patch | 1 + device/linux-lg-mako/gcc8-fix-put-user.patch | 1 + 4 files changed, 33 insertions(+), 95 deletions(-) delete mode 100644 device/linux-lg-mako/compiler-gcc6.h create mode 120000 device/linux-lg-mako/gcc7-give-up-on-ilog2-const-optimizations.patch create mode 120000 device/linux-lg-mako/gcc8-fix-put-user.patch diff --git a/device/linux-lg-mako/APKBUILD b/device/linux-lg-mako/APKBUILD index 6666bab73..e92d7f3a3 100644 --- a/device/linux-lg-mako/APKBUILD +++ b/device/linux-lg-mako/APKBUILD @@ -1,34 +1,31 @@ +# Reference: # Kernel config based on: arch/arm/configs/lineageos_mako_defconfig pkgname="linux-lg-mako" pkgver=3.4.0 -pkgrel=8 -pkgdesc="Nexus 4 kernel from LineageOS" +pkgrel=9 +pkgdesc="Google Nexus 4 kernel fork" arch="armhf" _carch="arm" _flavor="lg-mako" -url="https://github.com/LineageOS/lge-kernel-mako" -license="GPL2" +url="https://kernel.org" +license="GPL-2.0-only" options="!strip !check !tracedeps" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev gcc6" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev" -# Compiler: this kernel was only tested with GCC6. Feel free to make a merge -# request if you find out that it is booting working with newer GCCs as -# well. See for instructions. -if [ "${CC:0:5}" != "gcc6-" ]; then - CC="gcc6-$CC" - HOSTCC="gcc6-gcc" - CROSS_COMPILE="gcc6-$CROSS_COMPILE" -fi +# Compiler: latest GCC from Alpine +HOSTCC="${CC:-gcc}" +HOSTCC="${HOSTCC#${CROSS_COMPILE}}" # Source _repository="lge-kernel-mako" _commit="1495bfcf93f9e0e896331f29e1850387c31d6714" -_config="config-${_flavor}.armhf" +_config="config-${_flavor}.${arch}" source=" $pkgname-$_commit.tar.gz::https://github.com/LineageOS/${_repository}/archive/${_commit}.tar.gz $_config - compiler-gcc6.h + gcc7-give-up-on-ilog2-const-optimizations.patch + gcc8-fix-put-user.patch 01_msm-fix-perf_trace_counters.patch 02_gpu-msm-fix-gcc5-compile.patch " @@ -36,30 +33,38 @@ builddir="$srcdir/${_repository}-${_commit}" prepare() { default_prepare - - # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$builddir/include/linux/" - - cp "$srcdir"/$_config "$builddir"/.config - make ARCH="$_carch" HOSTCC="$HOSTCC" silentoldconfig + downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC" } build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" } package() { - install -Dm644 "$builddir/arch/arm/boot/zImage" \ - "$pkgdir/boot/vmlinuz-$_flavor" - + # kernel.release install -D "$builddir/include/config/kernel.release" \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + + # zImage (find the right one) + cd "$builddir/arch/$_carch/boot" + _target="$pkgdir/boot/vmlinuz-$_flavor" + for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do + [ -e "$_zimg" ] || continue + msg "zImage found: $_zimg" + install -Dm644 "$_zimg" "$_target" + break + done + if ! [ -e "$_target" ]; then + error "Could not find zImage in $PWD!" + return 1 + fi } sha512sums="41d6b4446dbccf8a8b0e362ad0875341fb17b2a2e95c5be0450f419b838bd5b65de27dda5cce2d9d51c97d45884343f2ecf2a1323671926a82815ea2b5c13294 linux-lg-mako-1495bfcf93f9e0e896331f29e1850387c31d6714.tar.gz 898d5e7c3c5f5d4c8c899345a56876bc55f0d45aa8d5833bbf1571d10714712066248e2b0c9b21660e0c7491af84bee1788dc240bf40f93e2c6712039aa2e98a config-lg-mako.armhf -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h +77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch +0b33408a0c024c6a9103cc1006bf1534d0146333815a91406a8ae87ce5ec09da0ec427f2c7df211ecbd0a0a59206b3757f6196b9f2d3963734acc69807a5bbf2 gcc8-fix-put-user.patch f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f4601ca4f441700f7fe49075c7eca4fb2d66b01f7d413ccb7 01_msm-fix-perf_trace_counters.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch" diff --git a/device/linux-lg-mako/compiler-gcc6.h b/device/linux-lg-mako/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/linux-lg-mako/compiler-gcc6.h +++ /dev/null @@ -1,69 +0,0 @@ -// SOURCE: -// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505 - -#ifndef __LINUX_COMPILER_H -#error "Please don't include directly, include instead." -#endif - -#define __used __attribute__((__used__)) -#define __must_check __attribute__((warn_unused_result)) -#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) - -/* Mark functions as cold. gcc will assume any path leading to a call - to them will be unlikely. This means a lot of manual unlikely()s - are unnecessary now for any paths leading to the usual suspects - like BUG(), printk(), panic() etc. [but let's keep them for now for - older compilers] - - Early snapshots of gcc 4.3 don't support this and we can't detect this - in the preprocessor, but we can live with this because they're unreleased. - Maketime probing would be overkill here. - - gcc also has a __attribute__((__hot__)) to move hot functions into - a special section, but I don't see any sense in this right now in - the kernel context */ -#define __cold __attribute__((__cold__)) - -#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) - -#ifndef __CHECKER__ -# define __compiletime_warning(message) __attribute__((warning(message))) -# define __compiletime_error(message) __attribute__((error(message))) -#endif /* __CHECKER__ */ - -/* - * Mark a position in code as unreachable. This can be used to - * suppress control flow warnings after asm blocks that transfer - * control elsewhere. - * - * Early snapshots of gcc 4.5 don't support this and we can't detect - * this in the preprocessor, but we can live with this because they're - * unreleased. Really, we need to have autoconf for the kernel. - */ -#define unreachable() __builtin_unreachable() - -/* Mark a function definition as prohibited from being cloned. */ -#define __noclone __attribute__((__noclone__)) - -/* - * Tell the optimizer that something else uses this function or variable. - */ -#define __visible __attribute__((externally_visible)) - -/* - * GCC 'asm goto' miscompiles certain code sequences: - * - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 - * - * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. - * - * (asm goto is automatically volatile - the naming reflects this.) - */ -#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - -#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -#define __HAVE_BUILTIN_BSWAP32__ -#define __HAVE_BUILTIN_BSWAP64__ -#define __HAVE_BUILTIN_BSWAP16__ -#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ - diff --git a/device/linux-lg-mako/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/linux-lg-mako/gcc7-give-up-on-ilog2-const-optimizations.patch new file mode 120000 index 000000000..da3d1ed41 --- /dev/null +++ b/device/linux-lg-mako/gcc7-give-up-on-ilog2-const-optimizations.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch \ No newline at end of file diff --git a/device/linux-lg-mako/gcc8-fix-put-user.patch b/device/linux-lg-mako/gcc8-fix-put-user.patch new file mode 120000 index 000000000..1d40b2674 --- /dev/null +++ b/device/linux-lg-mako/gcc8-fix-put-user.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc8-fix-put-user.patch \ No newline at end of file