Skip to contentSkip to conversation

s390 update (3/9): listing & kerntypes.

PATCH In review Martin Schwidefsky 2 participants 2 messages Mar 26, 2003 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390 update (3/9): listing & kerntypes.

Remove rule to generate kernel listing. Add code to generate kerntypes for use with the lkcd utils.

diffstat:

 s390/Makefile          |    6 ++---
 s390/boot/Makefile     |   18 +++++++---------
 s390/boot/kerntypes.c  |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 s390x/Makefile         |    6 ++---
 s390x/boot/Makefile    |   17 ++++++---------
 s390x/boot/kerntypes.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 127 insertions(+), 26 deletions(-)
arch/s390/Makefile +3 -3
diff -urN linux-2.5.66/arch/s390/Makefile linux-2.5.66-s390/arch/s390/Makefile
@@ -18,7 +18,7 @@
 LDFLAGS_vmlinux := -e start
 LDFLAGS_BLOB	:= --format binary --oformat elf32-s390
 
-CFLAGS += -pipe -fno-strength-reduce -finline-limit=10000 -Wno-sign-compare
+CFLAGS += -pipe -fno-strength-reduce -finline-limit-10000 -Wno-sign-compare
 
 head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
@@ -30,9 +30,9 @@
 
 makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
 
-all: image listing
+all: image kerntypes.o
 
-listing image: vmlinux
+image kerntypes.o: vmlinux
 	$(call makeboot,arch/$(ARCH)/boot/$@)
 
 install: vmlinux
arch/s390/boot/Makefile +8 -10
diff -urN linux-2.5.66/arch/s390/boot/Makefile linux-2.5.66-s390/arch/s390/boot/Makefile
@@ -2,19 +2,17 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-targets		:= image listing
-EXTRA_AFLAGS	:= -traditional
-quiet_cmd_listing = OBJDUMP $@
-      cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
-			       --disassemble-zeroes --reloc vmlinux > $@
+COMPILE_VERSION := __linux_compile_version_id__`hostname`__`date | \
+			tr -c '[0-9A-Za-z]' '_'`_t
 
-$(obj)/image: vmlinux FORCE
-	$(call if_changed,objcopy)
+EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I .
+EXTRA_AFLAGS  := -traditional
 
-$(obj)/listing: vmlinux FORCE
-	$(call if_changed,listing)
+targets := image kerntypes.o
 
+$(obj)/image: vmlinux FORCE
+	$(call if_changed,objcopy)
 
 install: $(CONFIGURE) $(obj)/image
 	sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
-	      System.map Kerntypes "$(INSTALL_PATH)"
+	      System.map "$(INSTALL_PATH)"
arch/s390/boot/kerntypes.c +53 -0

53 lines not on this page · raw message

arch/s390x/Makefile +3 -3
diff -urN linux-2.5.66/arch/s390x/Makefile linux-2.5.66-s390/arch/s390x/Makefile
@@ -19,7 +19,7 @@
 MODFLAGS += -fpic -D__PIC__
 LDFLAGS_BLOB	:= --format binary --oformat elf64-s390
 
-CFLAGS += -pipe -fno-strength-reduce -finline-limit=10000 -Wno-sign-compare
+CFLAGS += -pipe -fno-strength-reduce -finline-limit-10000 -Wno-sign-compare
 
 head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
@@ -30,9 +30,9 @@
 
 makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
 
-all: image listing
+all: image kerntypes.o
 
-listing image: vmlinux
+image kerntypes.o: vmlinux
 	$(call makeboot,arch/$(ARCH)/boot/$@)
 
 install: vmlinux
arch/s390x/boot/Makefile +7 -10
diff -urN linux-2.5.66/arch/s390x/boot/Makefile linux-2.5.66-s390/arch/s390x/boot/Makefile
@@ -2,20 +2,17 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-targets		:= image listing
-EXTRA_AFLAGS	:= -traditional
+COMPILE_VERSION := __linux_compile_version_id__`hostname`__`date | \
+			tr -c '[0-9A-Za-z]' '_'`_t
 
-quiet_cmd_listing = OBJDUMP $@
-      cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
-			       --disassemble-zeroes --reloc vmlinux > $@
+EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I .
+EXTRA_AFLAGS  := -traditional
+
+targets := image kerntypes.o
 
 $(obj)/image: vmlinux FORCE
 	$(call if_changed,objcopy)
 
-$(obj)/listing: vmlinux FORCE
-	$(call if_changed,listing)
-
-
 install: $(CONFIGURE) $(obj)/image
 	sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
-	      System.map Kerntypes "$(INSTALL_PATH)"
+	      System.map "$(INSTALL_PATH)"
arch/s390x/boot/kerntypes.c +53 -0

53 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Martin Schwidefsky

Remove rule to generate kernel listing. Add code to generate kerntypes for use with the lkcd utils.

No. Either we add Kerntypes to the architecture-independent code (I'm all for it!) or not at all. Cludging this into s390-specific code is a very, very bad idea.