Compare commits
1
Commits
libssc-patch
...
i9105p
| Author | SHA1 | Date | |
|---|---|---|---|
 VaporGame
|
97159fccd6 |
No files matched your search
@@ -0,0 +1,33 @@
|
||||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-samsung-i9105p
|
||||
pkgdesc="Samsung Galaxy S2 Plus"
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
arch="armv7"
|
||||
options="!check !archcheck"
|
||||
depends="
|
||||
linux-samsung-i9105p
|
||||
mkbootimg
|
||||
postmarketos-base
|
||||
postmarketos-initramfs-minimal
|
||||
"
|
||||
makedepends="devicepkg-dev"
|
||||
source="
|
||||
deviceinfo
|
||||
modules-initfs
|
||||
"
|
||||
|
||||
build() {
|
||||
devicepkg_build $startdir $pkgname
|
||||
}
|
||||
|
||||
package() {
|
||||
devicepkg_package $startdir $pkgname
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
52ce2a588e8daacb148b03da350c55a9afb26f54fbe925930d4153430efff53ecf7371dc7b9547a102d190205adbe5994288cc04a7113a5894c355072e62abcf deviceinfo
|
||||
e70bae17df23dcaaaea0e2d3616556f04baa23f8ee1357785c0f539bf97282d8ddff53953e155b72689bb73beb38c2da3d08de2a61e866684edfa10a6593885d modules-initfs
|
||||
"
|
||||
@@ -0,0 +1,33 @@
|
||||
# Reference: <https://postmarketos.org/deviceinfo>
|
||||
# Please use double quotes only. You can source this file in shell
|
||||
# scripts.
|
||||
|
||||
deviceinfo_format_version="0"
|
||||
deviceinfo_name="Samsung Galaxy S2 Plus"
|
||||
deviceinfo_manufacturer="Samsung"
|
||||
deviceinfo_codename="samsung-i9105p"
|
||||
deviceinfo_year="2013"
|
||||
deviceinfo_dtb=""
|
||||
deviceinfo_arch="armv7"
|
||||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
deviceinfo_keyboard="false"
|
||||
deviceinfo_external_storage="true"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="heimdall-bootimg"
|
||||
deviceinfo_kernel_cmdline="console=ttyS0,115200n8 mem=832M@0xA2000000 androidboot.console=ttyS0 vc-cma-mem=0/176M@0xCB000000 buildvariant=userdebug"
|
||||
deviceinfo_generate_bootimg="true"
|
||||
deviceinfo_bootimg_qcdt="false"
|
||||
deviceinfo_bootimg_dtb_second="false"
|
||||
deviceinfo_flash_pagesize="4096"
|
||||
deviceinfo_header_version="0"
|
||||
deviceinfo_flash_offset_base="0xa2000000"
|
||||
deviceinfo_flash_offset_kernel="0x00008000"
|
||||
deviceinfo_flash_offset_ramdisk="0x01000000"
|
||||
deviceinfo_flash_offset_second="0x00f00000"
|
||||
deviceinfo_flash_offset_tags="0x00000100"
|
||||
deviceinfo_flash_heimdall_partition_kernel="KERNEL"
|
||||
deviceinfo_flash_heimdall_partition_rootfs="system"
|
||||
deviceinfo_flash_sparse="true"
|
||||
@@ -0,0 +1,9 @@
|
||||
# Remove this file if unnecessary (CHANGEME!)
|
||||
# This file shall contain a list of modules to be included in the initramfs,
|
||||
# so that they are available in early boot stages. In general, it should
|
||||
# include modules to support unlocking FDE (touchscreen, panel, etc),
|
||||
# USB networking, and telnet in the debug-shell.
|
||||
# The format is one module name per line. Lines starting with the character
|
||||
# '#', and empty lines are ignored. If there are multiple kernel variants
|
||||
# with different initramfs module requirements, one modules-initfs.$variant
|
||||
# file should be created for each of them.
|
||||
@@ -0,0 +1,51 @@
|
||||
This fixes compilation with ANDROID_PARANOID_NETWORK disabled. Without this
|
||||
patch, compilation breaks with:
|
||||
|
||||
/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:
|
||||
In function 'cap_capable':
|
||||
/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:91:40:
|
||||
error: 'AID_NET_RAW' undeclared (first use in this function)
|
||||
if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
|
||||
^~~~~~~~~~~
|
||||
/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:91:40:
|
||||
note: each undeclared identifier is reported only once for each function it
|
||||
appears in
|
||||
/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:93:42:
|
||||
error: 'AID_NET_ADMIN' undeclared (first use in this function)
|
||||
if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN))
|
||||
---
|
||||
From e9a85c71afa38ee304e71c86ca7d74ed4658318c Mon Sep 17 00:00:00 2001
|
||||
From: Tushar Behera <tushar.behera@linaro.org>
|
||||
Date: Mon, 26 Mar 2012 16:54:15 +0530
|
||||
Subject: [PATCH] security: Add proper checks for Android specific capability
|
||||
checks
|
||||
|
||||
Commit b641072 ("security: Add AID_NET_RAW and AID_NET_ADMIN capability
|
||||
check in cap_capable().") introduces additional checks for AID_NET_xxx
|
||||
macros. Since the header file including those macros are conditionally
|
||||
included, the checks should also be conditionally executed.
|
||||
|
||||
Change-Id: Iaec5208d5b95a46b1ac3f2db8449c661e803fa5b
|
||||
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
|
||||
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
|
||||
---
|
||||
security/commoncap.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
||||
index 897af00e477..0051ac2d058 100644
|
||||
--- a/security/commoncap.c
|
||||
+++ b/security/commoncap.c
|
||||
@@ -80,10 +80,12 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
|
||||
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
|
||||
int cap, int audit)
|
||||
{
|
||||
+#ifdef CONFIG_ANDROID_PARANOID_NETWORK
|
||||
if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
|
||||
return 0;
|
||||
if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN))
|
||||
return 0;
|
||||
+#endif
|
||||
|
||||
for (;;) {
|
||||
/* The creator of the user namespace has all caps. */
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
From patchwork Sun Nov 18 20:05:13 2012
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Peter Foley <pefoley2@verizon.net>
|
||||
X-Patchwork-Id: 1761511
|
||||
Return-Path: <linux-kbuild-owner@vger.kernel.org>
|
||||
X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org
|
||||
Delivered-To: patchwork-process-083081@patchwork1.kernel.org
|
||||
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||
by patchwork1.kernel.org (Postfix) with ESMTP id 78BDF3FCDE
|
||||
for <patchwork-linux-kbuild@patchwork.kernel.org>;
|
||||
Sun, 18 Nov 2012 21:04:50 +0000 (UTC)
|
||||
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S1752505Ab2KRVEt (ORCPT
|
||||
<rfc822;patchwork-linux-kbuild@patchwork.kernel.org>);
|
||||
Sun, 18 Nov 2012 16:04:49 -0500
|
||||
Received: from vms173019pub.verizon.net ([206.46.173.19]:63407 "EHLO
|
||||
vms173019pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||
with ESMTP id S1752411Ab2KRVEt (ORCPT
|
||||
<rfc822;linux-kbuild@vger.kernel.org>);
|
||||
Sun, 18 Nov 2012 16:04:49 -0500
|
||||
X-Greylist: delayed 3600 seconds by postgrey-1.27 at vger.kernel.org;
|
||||
Sun, 18 Nov 2012 16:04:49 EST
|
||||
Received: from linux.foleyremote.com ([unknown] [96.241.26.26])
|
||||
by vms173019.mailsrvcs.net
|
||||
(Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16
|
||||
2009))
|
||||
with ESMTPA id <0MDP00A8H93H2UG1@vms173019.mailsrvcs.net>; Sun,
|
||||
18 Nov 2012 14:04:30 -0600 (CST)
|
||||
From: pefoley2@verizon.net
|
||||
To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
|
||||
mmarek@suse.cz
|
||||
Cc: Peter Foley <pefoley2@verizon.net>
|
||||
Subject: [PATCH 1/5] kbuild: remove deprecated use of defined in timeconst.pl
|
||||
Date: Sun, 18 Nov 2012 15:05:13 -0500
|
||||
Message-id: <1353269117-39917-1-git-send-email-pefoley2@verizon.net>
|
||||
X-Mailer: git-send-email 1.8.0
|
||||
Sender: linux-kbuild-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kbuild.vger.kernel.org>
|
||||
X-Mailing-List: linux-kbuild@vger.kernel.org
|
||||
|
||||
From: Peter Foley <pefoley2@verizon.net>
|
||||
|
||||
Fix this warning by removing a unneeded use of defined
|
||||
|
||||
TIMEC kernel/timeconst.h
|
||||
defined(@array) is deprecated at kernel/timeconst.pl line 373.
|
||||
(Maybe you should just omit the defined()?)
|
||||
|
||||
Signed-off-by: Peter Foley <pefoley2@verizon.net>
|
||||
---
|
||||
kernel/timeconst.pl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
|
||||
index eb51d76..0461239 100644
|
||||
--- a/kernel/timeconst.pl
|
||||
+++ b/kernel/timeconst.pl
|
||||
@@ -370,7 +370,7 @@ if ($hz eq '--can') {
|
||||
}
|
||||
|
||||
@val = @{$canned_values{$hz}};
|
||||
- if (!defined(@val)) {
|
||||
+ if (!@val) {
|
||||
@val = compute_values($hz);
|
||||
}
|
||||
output($hz, @val);
|
||||
@@ -0,0 +1,78 @@
|
||||
# Reference: <https://postmarketos.org/vendorkernel>
|
||||
# Kernel config based on: arch/arm/configs/(CHANGEME!)
|
||||
|
||||
pkgname=linux-samsung-i9105p
|
||||
pkgver=3.0.31
|
||||
pkgrel=0
|
||||
pkgdesc="Samsung Galaxy S2 Plus kernel fork"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
_flavor="samsung-i9105p"
|
||||
url="https://kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="
|
||||
bash
|
||||
bc
|
||||
bison
|
||||
devicepkg-dev
|
||||
findutils
|
||||
flex
|
||||
openssl-dev
|
||||
perl
|
||||
gcc4
|
||||
msm-fb-refresher
|
||||
"
|
||||
|
||||
# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
|
||||
if [ "${CC:0:5}" != "gcc4-" ]; then
|
||||
CC="gcc4-$CC"
|
||||
HOSTCC="gcc4-gcc"
|
||||
CROSS_COMPILE="gcc4-$CROSS_COMPILE"
|
||||
fi
|
||||
|
||||
|
||||
# Source
|
||||
_repository="android-kernel-samsung-i9105p"
|
||||
_commit="f2fd2e7d9bc81b99f97c3e70d990e1f29c4d0f82"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/VaporGame/$_repository/archive/$_commit.tar.gz
|
||||
$_config
|
||||
kernel-use-the-gnu89-standard-explicitly.patch
|
||||
gcc10-extern_YYLOC_global_declaration.patch
|
||||
linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
|
||||
1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
|
||||
03_fix_paranoid_network_disabled.patch
|
||||
linux3.4-fix-piggy.gzip.S.patch
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
_outdir="out"
|
||||
|
||||
prepare() {
|
||||
make ARCH="$_carch" mrproper
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
|
||||
"$_flavor" "$_outdir"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
7e909a2950c0c68ba1dc6bfe34f9516b02a529663c2c20b3b40b6316e9b2450137b07bfcd65c6d7b3d8c0b8aca7e2d1276a05859f952602df2a305b78f584f41 linux-samsung-i9105p-f2fd2e7d9bc81b99f97c3e70d990e1f29c4d0f82.tar.gz
|
||||
1314261766fc93998281d4192b30fb00dec494ec845155d3565ba46970335f66b18c0dc3ad1e400c11de38fd738695b04663f4ca81206e27745f4d5e0d990912 config-samsung-i9105p.armv7
|
||||
ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch
|
||||
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
|
||||
b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
|
||||
191746d2f7338a6afc3fe0f07a6be9164883c8ef78753727a4dcb4374e950243f27318eee17171c1fba2d86c5bcc2293568c9dad2293129ea703292b69389b25 1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
|
||||
df62e03666313bb03d9a455eac875f170a55d378b6e56b847c1c6ff1ce5cfafcfdf1d7605754ca3c684840ea00357f9ec4c6621f6ff77377132a484b9258f6f7 03_fix_paranoid_network_disabled.patch
|
||||
080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch
|
||||
"
|
||||
@@ -0,0 +1,77 @@
|
||||
# Reference: <https://postmarketos.org/vendorkernel>
|
||||
# Kernel config based on: arch/arm/configs/(CHANGEME!)
|
||||
|
||||
pkgname=linux-samsung-i9105p
|
||||
pkgver=3.0.31
|
||||
pkgrel=0
|
||||
pkgdesc="Samsung Galaxy S2 Plus kernel fork"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
_flavor="samsung-i9105p"
|
||||
url="https://kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="
|
||||
bash
|
||||
bc
|
||||
bison
|
||||
devicepkg-dev
|
||||
findutils
|
||||
flex
|
||||
openssl-dev
|
||||
perl
|
||||
gcc4
|
||||
"
|
||||
|
||||
# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
|
||||
if [ "${CC:0:5}" != "gcc4-" ]; then
|
||||
CC="gcc4-$CC"
|
||||
HOSTCC="gcc4-gcc"
|
||||
CROSS_COMPILE="gcc4-$CROSS_COMPILE"
|
||||
fi
|
||||
|
||||
|
||||
# Source
|
||||
_repository="android_kernel_samsung_i9105p"
|
||||
_commit="26a6d7902605f1983afe41c724f22969db21c2fd"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/VaporGame/$_repository/archive/$_commit.tar.gz
|
||||
$_config
|
||||
kernel-use-the-gnu89-standard-explicitly.patch
|
||||
gcc10-extern_YYLOC_global_declaration.patch
|
||||
linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
|
||||
1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
|
||||
03_fix_paranoid_network_disabled.patch
|
||||
linux3.4-fix-piggy.gzip.S.patch
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
_outdir="out"
|
||||
|
||||
prepare() {
|
||||
make ARCH="$_carch" mrproper
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
|
||||
"$_flavor" "$_outdir"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
4715b5765261b217e0e5677cde6561ab7a33204e343cb1062a53a03e2c4cd77d52cee571bc04901a344c84ab70ca047f7c162953fec3aa07b1bbd5a5e1db03d5 linux-samsung-i9105p-26a6d7902605f1983afe41c724f22969db21c2fd.tar.gz
|
||||
f9dd69d0eb64340c4cc6ab11864ca3c1ec75d3cce76baa38394f05429798b7e993a96962faaa2a028870fcf3a05d8b0f85e286d9ef54f2745c888f209c3afbea config-samsung-i9105p.armv7
|
||||
ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch
|
||||
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
|
||||
b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
|
||||
191746d2f7338a6afc3fe0f07a6be9164883c8ef78753727a4dcb4374e950243f27318eee17171c1fba2d86c5bcc2293568c9dad2293129ea703292b69389b25 1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
|
||||
df62e03666313bb03d9a455eac875f170a55d378b6e56b847c1c6ff1ce5cfafcfdf1d7605754ca3c684840ea00357f9ec4c6621f6ff77377132a484b9258f6f7 03_fix_paranoid_network_disabled.patch
|
||||
080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch
|
||||
"
|
||||
File diff suppressed because it is too large.
Load diff
+1
@@ -0,0 +1 @@
|
||||
../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.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__
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Desaulniers <ndesaulniers@google.com>
|
||||
Date: Mon, 4 Nov 2019 19:31:45 +0100
|
||||
Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
|
||||
directive
|
||||
|
||||
It looks like a section directive was using "Solaris style" to declare
|
||||
the section flags. Replace this with the GNU style so that Clang's
|
||||
integrated assembler can assemble this directive.
|
||||
|
||||
The modified instances were identified via:
|
||||
$ ag \.section | grep #
|
||||
|
||||
Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
|
||||
Link: https://github.com/ClangBuiltLinux/linux/issues/744
|
||||
Link: https://bugs.llvm.org/show_bug.cgi?id=43759
|
||||
Link: https://reviews.llvm.org/D69296
|
||||
|
||||
Acked-by: Nicolas Pitre <nico@fluxnic.net>
|
||||
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
|
||||
Reviewed-by: Stefan Agner <stefan@agner.ch>
|
||||
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
|
||||
Suggested-by: Fangrui Song <maskray@google.com>
|
||||
Suggested-by: Jian Cai <jiancai@google.com>
|
||||
Suggested-by: Peter Smith <peter.smith@linaro.org>
|
||||
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
||||
[ partial backport to 3.4 ]
|
||||
---
|
||||
arch/arm/boot/bootp/init.S | 2 +-
|
||||
arch/arm/boot/compressed/big-endian.S | 2 +-
|
||||
arch/arm/boot/compressed/head.S | 2 +-
|
||||
arch/arm/boot/compressed/piggy.lzma.S | 2 +-
|
||||
arch/arm/mm/proc-v7.S | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
|
||||
index 78b508075161..868eeeaaa46e 100644
|
||||
--- a/arch/arm/boot/bootp/init.S
|
||||
+++ b/arch/arm/boot/bootp/init.S
|
||||
@@ -16,7 +16,7 @@
|
||||
* size immediately following the kernel, we could build this into
|
||||
* a binary blob, and concatenate the zImage using the cat command.
|
||||
*/
|
||||
- .section .start,#alloc,#execinstr
|
||||
+ .section .start, "ax"
|
||||
.type _start, #function
|
||||
.globl _start
|
||||
|
||||
diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
|
||||
index 25ab26f1c6f0..f22428e275f8 100644
|
||||
--- a/arch/arm/boot/compressed/big-endian.S
|
||||
+++ b/arch/arm/boot/compressed/big-endian.S
|
||||
@@ -5,7 +5,7 @@
|
||||
* Author: Nicolas Pitre
|
||||
*/
|
||||
|
||||
- .section ".start", #alloc, #execinstr
|
||||
+ .section ".start", "ax"
|
||||
|
||||
mrc p15, 0, r0, c1, c0, 0 @ read control reg
|
||||
orr r0, r0, #(1 << 7) @ enable big endian mode
|
||||
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
|
||||
index 77a716bdf4d3..b70606652d21 100644
|
||||
--- a/arch/arm/boot/compressed/head.S
|
||||
+++ b/arch/arm/boot/compressed/head.S
|
||||
@@ -113,7 +113,7 @@
|
||||
#endif
|
||||
.endm
|
||||
|
||||
- .section ".start", #alloc, #execinstr
|
||||
+ .section ".start", "ax"
|
||||
/*
|
||||
* sort out different calling conventions
|
||||
*/
|
||||
diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
|
||||
index d7e69cffbc0a..cfea81ae8f4b 100644
|
||||
--- a/arch/arm/boot/compressed/piggy.lzma.S
|
||||
+++ b/arch/arm/boot/compressed/piggy.lzma.S
|
||||
@@ -1,4 +1,4 @@
|
||||
- .section .piggydata,#alloc
|
||||
+ .section .piggydata, "a"
|
||||
.globl input_data
|
||||
input_data:
|
||||
.incbin "arch/arm/boot/compressed/piggy.lzma"
|
||||
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
|
||||
index 69363be2f241..321cb1c6a091 100644
|
||||
--- a/arch/arm/mm/proc-v7.S
|
||||
+++ b/arch/arm/mm/proc-v7.S
|
||||
@@ -422,7 +422,7 @@ __v7_setup_stack:
|
||||
string cpu_elf_name, "v7"
|
||||
.align
|
||||
|
||||
- .section ".proc.info.init", #alloc, #execinstr
|
||||
+ .section ".proc.info.init", "ax"
|
||||
|
||||
/*
|
||||
* Standard v7 proc info content
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S
|
||||
index a68adf91a16..175ed02a6ac 100644
|
||||
--- a/arch/arm/boot/compressed/piggy.gzip.S
|
||||
+++ b/arch/arm/boot/compressed/piggy.gzip.S
|
||||
@@ -1,4 +1,4 @@
|
||||
- .section .piggydata,#alloc
|
||||
+ .section .piggydata, "a"
|
||||
.globl input_data
|
||||
input_data:
|
||||
.incbin "arch/arm/boot/compressed/piggy.gzip"
|
||||
Reference in new issue
Block a user