Skip to contentSkip to conversation

UML - TT_MODE build fix

PATCH In review Raphael Bossek 2 participants 3 messages Jun 24, 2005 – Jul 6, 2005 User-mode Linux (UML)

lore
Share & tools
lore

Raphael Bossek

author
#0 lore raw

PATCH 1/1 UML - TT_MODE build fix

Using of the preprocessor define SUBARCH as part of an directory name does not work in linux-2.6.12/arch/um/kernel/uml.lds.S:

arch/um/sys-SUBARCH/unmap_fin.o => arch/um/sys- i386 /unmap_fin.o

This patch works with linux 2.6.12-mm1 and gcc 2.95.

Bin�rdateien linux-2.6.12.orig/arch/um/kernel/skas/util/mk_ptregs and linux-2.6.12/arch/um/kernel/skas/util/mk_ptregs sind verschieden.

arch/um/kernel/uml.lds.S +1 -6
diff -Nru linux-2.6.12.orig/arch/um/kernel/uml.lds.S linux-2.6.12/arch/um/kernel/uml.lds.S
@@ -15,12 +15,7 @@
    * is remapped.*/
   __binary_start = .;
 
-#ifdef MODE_TT
-  .remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) }
-  .remap : { arch/um/sys-SUBARCH/unmap_fin.o (.text) }
-
-  . = ALIGN(4096);		/* Init code and data */
-#endif
+#include "mode_tt.lds"
 
   _stext = .;
   __init_begin = .;

Bin�rdateien linux-2.6.12.orig/arch/um/os-Linux/util/mk_user_constants and linux-2.6.12/arch/um/os-Linux/util/mk_user_constants sind verschieden.

arch/um/scripts/Makefile.rules +1 -0
diff -Nru linux-2.6.12.orig/arch/um/scripts/Makefile.rules linux-2.6.12/arch/um/scripts/Makefile.rules
@@ -6,6 +6,7 @@
 	$(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
 USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m)  $(USER_SINGLE_OBJS))
 USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+CPPFLAGS += -Iarch/um/sys-$(SUBARCH)
 
 $(USER_OBJS) : c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \
 	$(CFLAGS_$(notdir $@))
arch/um/sys-i386/mode_tt.lds +6 -0
diff -Nru linux-2.6.12.orig/arch/um/sys-i386/mode_tt.lds linux-2.6.12/arch/um/sys-i386/mode_tt.lds
@@ -0,0 +1,6 @@
+#ifdef MODE_TT
+  .remap_data : { arch/um/sys-i386/unmap_fin.o (.data .bss) }
+  .remap : { arch/um/sys-i386/unmap_fin.o (.text) }
+
+  . = ALIGN(4096);		/* Init code and data */
+#endif

Bin�rdateien linux-2.6.12.orig/arch/um/sys-i386/util/mk_sc and linux-2.6.12/arch/um/sys-i386/util/mk_sc sind verschieden. Bin�rdateien linux-2.6.12.orig/arch/um/sys-i386/util/mk_thread and linux-2.6.12/arch/um/sys-i386/util/mk_thread sind verschieden.

arch/um/sys-ia64/mode_tt.lds +6 -0
diff -Nru linux-2.6.12.orig/arch/um/sys-ia64/mode_tt.lds linux-2.6.12/arch/um/sys-ia64/mode_tt.lds
@@ -0,0 +1,6 @@
+#ifdef MODE_TT
+  .remap_data : { arch/um/sys-ia64/unmap_fin.o (.data .bss) }
+  .remap : { arch/um/sys-ia64/unmap_fin.o (.text) }
+
+  . = ALIGN(4096);		/* Init code and data */
+#endif
arch/um/sys-ppc/mode_tt.lds +6 -0
diff -Nru linux-2.6.12.orig/arch/um/sys-ppc/mode_tt.lds linux-2.6.12/arch/um/sys-ppc/mode_tt.lds
@@ -0,0 +1,6 @@
+#ifdef MODE_TT
+  .remap_data : { arch/um/sys-ppc/unmap_fin.o (.data .bss) }
+  .remap : { arch/um/sys-ppc/unmap_fin.o (.text) }
+
+  . = ALIGN(4096);		/* Init code and data */
+#endif
arch/um/sys-x86_64/mode_tt.lds +6 -0
diff -Nru linux-2.6.12.orig/arch/um/sys-x86_64/mode_tt.lds linux-2.6.12/arch/um/sys-x86_64/mode_tt.lds
@@ -0,0 +1,6 @@
+#ifdef MODE_TT
+  .remap_data : { arch/um/sys-x86_64/unmap_fin.o (.data .bss) }
+  .remap : { arch/um/sys-x86_64/unmap_fin.o (.text) }
+
+  . = ALIGN(4096);		/* Init code and data */
+#endif
#1 lore raw
Quoted 6 lines · Raphael Bossek

Using of the preprocessor define SUBARCH as part of an directory name does not work in linux-2.6.12/arch/um/kernel/uml.lds.S:

arch/um/sys-SUBARCH/unmap_fin.o => arch/um/sys- i386 /unmap_fin.o

This patch works with linux 2.6.12-mm1 and gcc 2.95.

I.e. there is this difference with gcc-2.95? Oh hell, it works with 3.4 (even though it has other problems, which I'm going to solve shortly (I hope)).

Signature · 23 lines
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
#2 lore raw
In reply to Raphael Bossek
Quoted 6 lines · Raphael Bossek

Using of the preprocessor define SUBARCH as part of an directory name does not work in linux-2.6.12/arch/um/kernel/uml.lds.S:

arch/um/sys-SUBARCH/unmap_fin.o => arch/um/sys- i386 /unmap_fin.o

This patch works with linux 2.6.12-mm1 and gcc 2.95.

Ok, I've thought to this, and it's simpler IMHO to pass

-DSUBARCH_FILE=arch/um/sys-i386/unmap_fin.o

the linker will happily ignore the following space, since there's already one space in that position.

Signature · 23 lines
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel