From acf8878a295912683096c1c1a4878316e99e4202 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 3 Sep 2008 17:59:29 +0000
Subject: [PATCH] 
 STABLE14-linux26-libafs-makefileproto-trust-kbuild-system-no-really-20080903

LICENSE IPL10

if we are really not using COMMON_KERN_CFLAGS and being trusting, let's do so.


(cherry picked from commit 995ee981fd2631d6e1e45311cee0a6d58f4a56be)
---
 src/libafs/MakefileProto.LINUX.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 14ef62129..4c6c9bda0 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -50,26 +50,26 @@ DEFINES = $(COMMON_DEFINES)
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@
 DEFINES = $(COMMON_DEFINES) -DCPU=586
 
-<amd64_linux24 amd64_linux26>
+<amd64_linux22 amd64_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -mcmodel=kernel -mno-red-zone
 DEFINES = $(COMMON_DEFINES) 
 
-<i386_umlinux22 i386_umlinux24 i386_umlinux26>
+<i386_umlinux22 i386_umlinux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@ -Wno-strict-prototypes -I$(LINUX_KERNEL_PATH)/arch/um/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/tt/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/skas/include
 DEFINES = $(COMMON_DEFINES) -DCPU=586
 
 <i386_umlinux26>
 EXTRA_CFLAGS = -I$(LINUX_KERNEL_PATH)/arch/um/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/tt/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/skas/include
 
-<alpha_linux_22 alpha_linux_24 alpha_linux_26>
+<alpha_linux_22 alpha_linux_24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -mno-fp-regs -ffixed-8
 DEFINES = $(COMMON_DEFINES)
 
-<s390_linux22 s390_linux24 s390_linux26>
+<s390_linux22 s390_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
 DEFINES = $(COMMON_DEFINES) -D__s390__ 
 
-<s390x_linux22 s390x_linux24 s390x_linux26>
+<s390x_linux22 s390x_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
 DEFINES = $(COMMON_DEFINES) -D__s390x__ 
 
@@ -85,7 +85,7 @@ CCFLAGS = $(COMMON_KERN_CFLAGS) \
       -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare
 DEFINES = $(COMMON_DEFINES) -DCPU=sparc64
 
-<ppc_linux22 ppc_linux24 ppc64_linux24 ppc64_linux26>
+<ppc_linux22 ppc_linux24 ppc64_linux22 ppc64_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char -msoft-float -fno-builtin -ffixed-r2
 DEFINES = $(COMMON_DEFINES) -D__powerpc__
 
-- 
2.39.5