[parisc-linux-cvs] linux-2.5 tausq

[Randolph Chung]

> changes so that a 2.5 kernel will report the machine as parisc64 instead of parisc for 64-bit kernels

this carries over the "hack" we had in 2.4 for separating ARCH from
UTS_MACHINE, using the mkcompile script that's in 2.5

Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    1 Sep 2002 06:41:16 -0000       1.5
+++ Makefile    1 Sep 2002 16:21:55 -0000
@@ -40,6 +40,8 @@ KERNELPATH=kernel-$(shell echo $(KERNELR

 ARCH := parisc

+UTS_MACHINE := $(ARCH)
+
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
          else if [ -x /bin/bash ]; then echo /bin/bash; \
          else echo sh; fi ; fi)
@@ -151,7 +153,8 @@ NOSTDINC_FLAGS  = -nostdinc -iwithprefix

 export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
        CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
-       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
+       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL \
+       UTS_MACHINE

 export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS OBJCOPYFLAGS
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
Index: init/Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/init/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- init/Makefile       30 Aug 2002 20:00:43 -0000      1.3
+++ init/Makefile       1 Sep 2002 16:21:55 -0000
@@ -19,4 +19,4 @@ $(obj)/version.o: $(objtree)/include/lin

 $(objtree)/include/linux/compile.h: FORCE
        @echo -n '  Generating $@'
-       @$(srctree)/scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
+       @$(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"

--  
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/