Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit ac7436d

Browse files
Merge pull request #145 from nathanchance/make-everything-green-again
Make everything green again
2 parents a00c36a + ade641c commit ac7436d

10 files changed

+14
-6
lines changed

driver.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ build_linux() {
242242
git show -s | cat
243243

244244
apply_patches "../patches/all"
245+
apply_patches "../patches/${REPO}/all"
245246
apply_patches "../patches/${REPO}/${ARCH}"
246247

247248
# Only clean up old artifacts if requested, the Linux build system
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/all/v4-0001-lib-string.c-implement-a-basic-bcmp.patch

patches/linux/x86_64/x86-series.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8332da8a6f04ef2c1aea698cf78d96008afb58ff Mon Sep 17 00:00:00 2001
1+
From 1b0a2c0dfcd5b7190adb6e491851bf91f3bc014f Mon Sep 17 00:00:00 2001
22
From: Nathan Chancellor <[email protected]>
33
Date: Sat, 5 Jan 2019 11:51:39 -0700
44
Subject: [PATCH 1/2] DO-NOT-UPSTREAM: x86: Revert two commits that break the
@@ -162,7 +162,7 @@ index 1954dd5552a2..fd49f32afdbc 100644
162162
2.21.0
163163

164164

165-
From e8e8b6a3501be642a50675f7441d30c6a16bc86f Mon Sep 17 00:00:00 2001
165+
From f55f98b98f9ea0a6abd0c5c89ccef9bedb5f926a Mon Sep 17 00:00:00 2001
166166
From: Nathan Chancellor <[email protected]>
167167
Date: Tue, 25 Sep 2018 13:32:33 -0700
168168
Subject: [PATCH 2/2] DO-NOT-UPSTREAM: x86: Avoid warnings/errors due to lack
@@ -186,11 +186,11 @@ Signed-off-by: Nathan Chancellor <[email protected]>
186186
3 files changed, 12 insertions(+), 4 deletions(-)
187187

188188
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
189-
index 2d8b9d8ca4f8..2329b1af60f9 100644
189+
index a587805c6687..2f1105de56cf 100644
190190
--- a/arch/x86/Makefile
191191
+++ b/arch/x86/Makefile
192-
@@ -223,6 +223,11 @@ ifdef CONFIG_RETPOLINE
193-
KBUILD_CFLAGS += $(call cc-option,--param=case-values-threshold=20)
192+
@@ -227,6 +227,11 @@ ifdef CONFIG_RETPOLINE
193+
endif
194194
endif
195195

196196
+# Avoid warnings in arch/x86/include/asm/cpufeature.h when building with Clang
@@ -201,7 +201,7 @@ index 2d8b9d8ca4f8..2329b1af60f9 100644
201201
archscripts: scripts_basic
202202
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
203203

204-
@@ -293,10 +298,6 @@ vdso_install:
204+
@@ -297,10 +302,6 @@ vdso_install:
205205

206206
archprepare: checkbin
207207
checkbin:

0 commit comments

Comments
 (0)