sys-apps/s390-tools: drop old <1.23.1 versions

4 files changed, 0 insertions, 529 deletions

diff --git a/sys-apps/s390-tools/files/s390-tools-1.13.0-build.patch b/sys-apps/s390-tools/files/s390-tools-1.13.0-build.patch
deleted file mode 100644
index 0676a5bb410..00000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.13.0-build.patch
+++ /dev/null
@@ -1,153 +0,0 @@
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- 	   ziomon iucvterm hyptop cmsfs-fuse
- 
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
- 
--subdirs_make:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \
--	done
-+all: $(SUB_DIRS_ALL)
- 
--clean:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \
--	done
-+_subdir   = $(patsubst subdirs_%,%,$@)
-+subdir    = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+	$(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
- 
- install:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd .. ); \
--	done
-+	$(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE   =
- AS              = $(call echocmd,"  AS      ",/$@)$(CROSS_COMPILE)as
--LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc
-+LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
- LD              = $(call echocmd,"  LD      ",/$@)$(CROSS_COMPILE)ld
- CC              = $(call echocmd,"  CC      ",/$@)$(CROSS_COMPILE)gcc
--LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++
-+LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
- CXX             = $(call echocmd,"  CXX     ",/$@)$(CROSS_COMPILE)g++
- CPP             = $(call echocmd,"  CPP     ",/$@)$(CROSS_COMPILE)gcc -E
- AR              = $(call echocmd,"  AR      ",/$@)$(CROSS_COMPILE)ar
-@@ -41,14 +41,13 @@
- ZFCPDUMP_RD     = zfcpdump.rd
- export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
- 
--CFLAGS		= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			-g $(OPT_FLAGS)
--CXXFLAGS	= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			 -g $(OPT_FLAGS)
-+CFLAGS		+= $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS	+= $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS	+= \
-+	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-+	-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-+	-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
-+export CPPFLAGS
- 
- # make G=1
- # Compile tools so that gcov can be used to collect code coverage data.
-@@ -76,7 +75,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- %: %.o
--	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- all:
- 
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
- 
- all: $(ZFCPDUMP_RD)
- 
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- $(ZFCPDUMP_RD): zfcp_dumper
- 	/bin/sh ./create_rd.sh $(ARCH)
- 
--zfcp_dumper: zfcp_dumper.o
--	$(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
--	$(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
- 
- install: $(ZFCPDUMP_RD)
- 	/bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- 	/bin/sh ./create_rd.sh -r
- 	rm -f *.o
--
--%.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
- 
--CFLAGS        += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- all: zfcpdump.image
- 
- zfcpdump: zfcpdump.c zfcpdump.h
--	$(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
- 
- e2fsck:
- 	tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
- 
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
- 
--CFLAGS  += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS  += -I../include -D__ASSEMBLY__ \
- 		-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES	:= fba0.bin fba2.bin eckd0.bin eckd1a.bin eckd1b.bin eckd2.bin \
- 	   eckd2dump.bin tapedump.bin stage3.bin tape0.bin fba2dump.bin \
- 	   eckd2mvdump.bin
-@@ -16,7 +15,7 @@
- %:	%.S
- 
- %.o:	%.S
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
- %.exec:	%.o
- 	@STAGE=$$(                                  \
diff --git a/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch b/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
deleted file mode 100644
index 7bf6cf41e94..00000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/391433
-
-You reported a zipl build problem for 31 bit:
-http://marc.info/?l=linux-s390&m=132307473025493&w=2
-
-The following patch (for s390-tools-1.15.0) should fix this problem:
----
-From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
-Subject: zipl: Do not use larl for 31 bit code
-
-The larl instruction is not available for pre z900 machines in 31 bit mode.
-In order to be able to compile zipl also for that machines, with this
-patch the larl instruction is replaced by instructions that work on
-older machines.
-
-Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
----
- zipl/boot/dumpcommon.S |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/zipl/boot/dumpcommon.S
-+++ b/zipl/boot/dumpcommon.S
-@@ -1005,7 +1005,7 @@ _count_mem_32:
-         mr    %r2,%r1                   # mem size in bytes in %r3
- 
-         st    %r3,.Ldh_real_mem_size+4-0b(%r13)
--        larl  %r7,.Lmem_upper_limit+4
-+        l     %r7,.Lmem_upper_limit_addr-0b(%r13)
-         l     %r6,0(%r7)                     # check if we have an upper limit
-         clr   %r3,%r6
-         bl    .Lsavemem-0b(%r13)
-@@ -1018,13 +1018,15 @@ _count_mem_32:
- 
-         clr   %r6,%r3
-         bne   .Lexit-0b(%r13)
--        larl  %r2,.Lmsg_mem_limit_set          # print mem limit warning
-+        la    %r2,.Lmsg_mem_limit_set-0b(%r13) # print mem limit warning
-         bras  %r14,_sclp_print
- .Lexit:
-         lm    %r6,%r15,120(%r15)
-         br    %r14
- .Lonemb:
-         .int 0x100000
-+.Lmem_upper_limit_addr:
-+	.long	.Lmem_upper_limit+4
- 
- 
- # expand Macros
-
-> it fixes most of them, but seems there's still one left :)
-
-Ok, try this one:
----
- zipl/boot/tapedump.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/zipl/boot/tapedump.S
-+++ b/zipl/boot/tapedump.S
-@@ -532,7 +532,7 @@ _dump_mem_32:
-         # Cartridge full
- 
-         la    %r2,EMEM
--        larl  %r14,_panik_32
-+        l     %r14,.Lpanik_32-0b(%r13)
-         basr  %r14,%r14
- 
- 1:      # All memory written
diff --git a/sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch b/sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch
deleted file mode 100644
index 5cead716cf0..00000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch
+++ /dev/null
@@ -1,153 +0,0 @@
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- 	   ziomon iucvterm hyptop cmsfs-fuse
- 
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
- 
--subdirs_make:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \
--	done
-+all: $(SUB_DIRS_ALL)
- 
--clean:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \
--	done
-+_subdir   = $(patsubst subdirs_%,%,$@)
-+subdir    = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+	$(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
- 
- install:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd ..; \
--	done
-+	$(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE   =
- AS              = $(call echocmd,"  AS      ",/$@)$(CROSS_COMPILE)as
--LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc
-+LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
- LD              = $(call echocmd,"  LD      ",/$@)$(CROSS_COMPILE)ld
- CC              = $(call echocmd,"  CC      ",/$@)$(CROSS_COMPILE)gcc
--LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++
-+LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
- CXX             = $(call echocmd,"  CXX     ",/$@)$(CROSS_COMPILE)g++
- CPP             = $(call echocmd,"  CPP     ",/$@)$(CROSS_COMPILE)gcc -E
- AR              = $(call echocmd,"  AR      ",/$@)$(CROSS_COMPILE)ar
-@@ -41,14 +41,13 @@
- ZFCPDUMP_RD     = zfcpdump.rd
- export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
- 
--CFLAGS		= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			-g $(OPT_FLAGS)
--CXXFLAGS	= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			 -g $(OPT_FLAGS)
-+CFLAGS		+= $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS	+= $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS	+= \
-+	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-+	-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-+	-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
-+export CPPFLAGS
- 
- # make G=1
- # Compile tools so that gcov can be used to collect code coverage data.
-@@ -76,7 +75,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- %: %.o
--	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- all:
- 
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
- 
- all: $(ZFCPDUMP_RD)
- 
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- $(ZFCPDUMP_RD): zfcp_dumper
- 	/bin/sh ./create_rd.sh $(ARCH)
- 
--zfcp_dumper: zfcp_dumper.o
--	$(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
--	$(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
- 
- install: $(ZFCPDUMP_RD)
- 	/bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- 	/bin/sh ./create_rd.sh -r
- 	rm -f *.o
--
--%.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
- 
--CFLAGS        += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- all: zfcpdump.image
- 
- zfcpdump: zfcpdump.c zfcpdump.h
--	$(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
- 
- e2fsck:
- 	tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
- 
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
- 
--CFLAGS  += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS  += -I../include -D__ASSEMBLY__ \
- 		-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES	:= fba0.bin fba2.bin eckd0.bin eckd1a.bin eckd1b.bin eckd2.bin \
- 	   eckd2dump.bin tapedump.bin stage3.bin tape0.bin fba2dump.bin \
- 	   eckd2mvdump.bin
-@@ -16,7 +15,7 @@
- %:	%.S
- 
- %.o:	%.S
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
- %.exec:	%.o
- 	@STAGE=$$(                                  \
diff --git a/sys-apps/s390-tools/files/s390-tools-1.9.0-build.patch b/sys-apps/s390-tools/files/s390-tools-1.9.0-build.patch
deleted file mode 100644
index 38d3e3f954d..00000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.9.0-build.patch
+++ /dev/null
@@ -1,156 +0,0 @@
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- 	   ziomon iucvterm cmsfs-fuse
- 
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
- 
--subdirs_make:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \
--	done
-+all: $(SUB_DIRS_ALL)
- 
--clean:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \
--	done
-+_subdir   = $(patsubst subdirs_%,%,$@)
-+subdir    = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+	$(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
- 
- install:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd .. ); \
--	done
-+	$(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE   =
- AS              = $(call echocmd,"  AS      ",/$@)$(CROSS_COMPILE)as
--LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc
-+LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
- LD              = $(call echocmd,"  LD      ",/$@)$(CROSS_COMPILE)ld
- CC              = $(call echocmd,"  CC      ",/$@)$(CROSS_COMPILE)gcc
--LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++
-+LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
- CXX             = $(call echocmd,"  CXX     ",/$@)$(CROSS_COMPILE)g++
- CPP             = $(call echocmd,"  CPP     ",/$@)$(CROSS_COMPILE)gcc -E
- AR              = $(call echocmd,"  AR      ",/$@)$(CROSS_COMPILE)ar
-@@ -41,11 +41,10 @@
- else
- 	WARNFLAGS = -W -Wall
- endif
--CFLAGS		= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-g $(OPT_FLAGS)
--CXXFLAGS	= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-g $(OPT_FLAGS)
--export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS
-+CFLAGS		+= $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS	+= $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS	+= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
-+export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS CXXFLAGS CPPFLAGS
- 
- # Support alternate install root
- INSTROOT        =
-@@ -76,7 +75,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- %: %.o
--	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- all:
- 
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
- 
- all: $(ZFCPDUMP_RD)
- 
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- $(ZFCPDUMP_RD): zfcp_dumper
- 	/bin/sh ./create_rd.sh $(ARCH)
- 
--zfcp_dumper: zfcp_dumper.o
--	$(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
--	$(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
- 
- install: $(ZFCPDUMP_RD)
- 	/bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- 	/bin/sh ./create_rd.sh -r
- 	rm -f *.o
--
--%.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
- 
--CFLAGS        += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- all: zfcpdump.image
- 
- zfcpdump: zfcpdump.c zfcpdump.h
--	$(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
- 
- e2fsck:
- 	tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
- 
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
- 
--CFLAGS  += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS  += -I../include -D__ASSEMBLY__ \
- 		-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES	:= fba0.bin fba2.bin eckd0.bin eckd1a.bin eckd1b.bin eckd2.bin \
- 	   eckd2dump.bin tapedump.bin stage3.bin tape0.bin fba2dump.bin \
- 	   eckd2mvdump.bin
-@@ -16,7 +15,7 @@
- %:	%.S
- 
- %.o:	%.S
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
- %.exec:	%.o
- 	@STAGE=$$(                                  \
-@@ -34,7 +33,7 @@
- 		2) SFLAGS="-nostdlib -Wl,-Ttext,0x2000";; \
- 		3) SFLAGS="-nostdlib -Wl,-Ttext,0xA000";; \
- 	esac;                                       \
--	$(LINK) $(LDFLAGS) -o $@ $$SFLAGS $<
-+	$(LINK) -o $@ $$SFLAGS $<
- 
- %.bin:	%.exec
- 	$(OBJCOPY) -O binary --only-section=.text $< $@