[klibc] Problems with klibc 1.1.8

[Sam Ravnborg]

On Wed, Dec 28, 2005 at 11:04:15AM -0800, H. Peter Anvin wrote:
> J??rg Billeter wrote:
> >
> >Sure, is attached.
> >
> 
> Thanks.  Turns out the handling of ARCHREQFLAGS has changed from the 
> non-kbuild version, and klcc (and Alpha) were broken as a result.  I 
> will check in a fix shortly.

Something like this?
This patch makes sure KLIBCREQFLAGS are set to the sum of KLIBCREQFLAGS
and KLIBCREQFLAGS.
Maybe it's time to clean up arch specific MCONFIG files to fix the
fixme?

	Sam

diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
index 8de9aa5..636047a 100644
--- a/scripts/Kbuild.klibc
+++ b/scripts/Kbuild.klibc
@@ -57,8 +57,8 @@ KLIBCLDFLAGS      :=
 include $(KLIBCSRC)/arch/$(ARCH)/MCONFIG
 
 # FIXME - backwards compatibility. Remove when all MCONFIGs are corrected
-KLIBCREQFLAGS     += $(REQFLAGS)
 KLIBCARCHREQFLAGS += $(ARCHREQFLAGS)
+KLIBCREQFLAGS     += $(REQFLAGS) $(KLIBCARCHREQFLAGS)
 KLIBCOPTFLAGS     += $(OPTFLAGS)
 KLIBCWARNFLAGS    += $(WARNFLAGS) -W -Wall -Wno-sign-compare
 KLIBCSHAREDFLAGS  += $(SHAREDFLAGS)
@@ -85,7 +85,7 @@ KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)i
 # klibc definitions
 KLIBCCPPFLAGS    += -D__KLIBC__=1 -D__KLIBC_MINOR__=0                       \
 		    -DBITSIZE=$(KLIBCBITSIZE)
-KLIBCCFLAGS      := $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS)  \
+KLIBCCFLAGS      := $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) \
                     $(KLIBCOPTFLAGS) $(KLIBCWARNFLAGS)
 KLIBCAFLAGS      := -D__ASSEMBLY__ $(KLIBCCFLAGS)
 KLIBCSTRIPFLAGS  := --strip-all -R .comment -R .note