Skip to contentSkip to conversation

i386 virtualization - Fix uml build

PATCH In review [email protected] 2 participants 3 messages Aug 15, 2005 – Aug 16, 2005 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 i386 virtualization - Fix uml build

Attempt to fix the UML build by assuming the default i386 subarchitecture (mach-default).

I can't fully test this because spinlock breakage is still happening in my tree, but it gets rid of the mach_xxx.h missing file warnings.

arch/um/Makefile-i386 +3 -1
Index: linux-2.6.13/arch/um/Makefile-i386
===================================================================
@@ -27,7 +27,9 @@
 endif
 endif
 
-CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS)
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS) \
+	  -Iinclude/asm-i386/mach-default \
+          $(if $(KBUILD_SRC),-Iinclude2/asm-i386/mach-default -I$(srctree)/include/asm-i386/mach-default)
 
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL
#1 lore raw
Quoted 5 lines · * [email protected] ([email protected]) wrote:

Attempt to fix the UML build by assuming the default i386 subarchitecture (mach-default).

I can't fully test this because spinlock breakage is still happening in my tree, but it gets rid of the mach_xxx.h missing file warnings.

I assume this is intended to fix a build error caused by patches in the earlier set which added more reliance on mach-default?

thanks,
-chris

#2 lore raw
Quoted 6 lines · Chris Wright
Quoted 3 lines · * [email protected] ([email protected]) wrote:

Attempt to fix the UML build by assuming the default i386 subarchitecture (mach-default).

Quoted 9 lines
Quoted 4 lines

I can't fully test this because spinlock breakage is still happening in my tree, but it gets rid of the mach_xxx.h missing file warnings.

I assume this is intended to fix a build error caused by patches in the earlier set which added more reliance on mach-default?

Yes, I already sent the fix to Jeff and Andrew, so it may already included in anything based off -mm1. But it seems a good idea in general for UML. I got a 100% clean um-i386 build after this patch on -rc5-mm1.

Zach