[uml-devel] [PATCH] UML - TT_MODE build fix

[uml-devel] [PATCH] UML - TT_MODE build fix

[Raphael Bossek]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

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.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: uml-2.6.12-mm1+fixttmode.diff --]
[-- Type: text/x-patch; name="uml-2.6.12-mm1+fixttmode.diff", Size: 3686 bytes --]

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.
diff -Nru linux-2.6.12.orig/arch/um/kernel/uml.lds.S linux-2.6.12/arch/um/kernel/uml.lds.S
--- linux-2.6.12.orig/arch/um/kernel/uml.lds.S	2005-06-22 16:16:15.000000000 +0200
+++ linux-2.6.12/arch/um/kernel/uml.lds.S	2005-06-23 10:05:14.000000000 +0200
@@ -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.
diff -Nru linux-2.6.12.orig/arch/um/scripts/Makefile.rules linux-2.6.12/arch/um/scripts/Makefile.rules
--- linux-2.6.12.orig/arch/um/scripts/Makefile.rules	2005-06-22 16:16:15.000000000 +0200
+++ linux-2.6.12/arch/um/scripts/Makefile.rules	2005-06-23 10:54:06.000000000 +0200
@@ -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 $@))
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
--- linux-2.6.12.orig/arch/um/sys-i386/mode_tt.lds	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12/arch/um/sys-i386/mode_tt.lds	2005-06-23 10:05:02.000000000 +0200
@@ -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.
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
--- linux-2.6.12.orig/arch/um/sys-ia64/mode_tt.lds	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12/arch/um/sys-ia64/mode_tt.lds	2005-06-23 10:06:02.000000000 +0200
@@ -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
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
--- linux-2.6.12.orig/arch/um/sys-ppc/mode_tt.lds	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12/arch/um/sys-ppc/mode_tt.lds	2005-06-23 10:06:20.000000000 +0200
@@ -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
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
--- linux-2.6.12.orig/arch/um/sys-x86_64/mode_tt.lds	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12/arch/um/sys-x86_64/mode_tt.lds	2005-06-23 10:06:45.000000000 +0200
@@ -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

Re: [uml-devel] [PATCH] UML - TT_MODE build fix

[Blaisorblade]

On Friday 24 June 2005 08:11, Raphael Bossek wrote:
> 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)).
-- 
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [PATCH] UML - TT_MODE build fix

[Blaisorblade]

On Friday 24 June 2005 08:11, Raphael Bossek wrote:
> 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.
-- 
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel