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.
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
