From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 27 Jul 2020 16:42:29 +0000 (+0200)
Subject: - adjusted x32 patch to work with gcc 10.2 (which defines __ILP32__ also for plain... 
X-Git-Tag: auto/th/kernel-tools-5.7.0-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel-tools.git;a=commitdiff_plain;h=e1e434f

- adjusted x32 patch to work with gcc 10.2 (which defines __ILP32__ also for plain ix86); release 4
---

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 7a9a041..267eed9 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -25,7 +25,7 @@ Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
 Version:	%{basever}%{postver}
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
diff --git a/x32.patch b/x32.patch
index b01ac4b..9573ff6 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,17 +1,18 @@
 FIXME: regs_load.S need complete x32 ABI support; now it will just compile, but tests won't run properly.
 --- linux-4.7/tools/scripts/Makefile.arch~	2015-02-09 03:54:22.000000000 +0100
 +++ linux-4.7/tools/scripts/Makefile.arch	2015-04-11 12:17:45.107911011 +0200
-@@ -24,8 +24,14 @@
+@@ -24,8 +24,15 @@
  ARCH ?= $(RAW_ARCH)
  
  LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
 +ILP32 := $(shell echo __ILP32__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
++X86_64 := $(shell echo __x86_64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
  ifeq ($(LP64), 1)
    IS_64_BIT := 1
  else
    IS_64_BIT := 0
  endif
-+ifeq ($(ILP32), 1)
++ifeq ($(x86_64)_$(ILP32), 1_1)
 +  IS_X32_BIT := 1
 +else
 +  IS_X32_BIT := 0