From: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
configure | 8 --
pc-bios/meson.build | 5 ++
pc-bios/s390-ccw/Makefile | 103 -------------------------
pc-bios/s390-ccw/meson.build | 175 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 180 insertions(+), 111 deletions(-)
delete mode 100644 pc-bios/s390-ccw/Makefile
create mode 100644 pc-bios/s390-ccw/meson.build
diff --git a/configure b/configure
index f6e3b0a..a1b71b9 100755
--- a/configure
+++ b/configure
@@ -6173,14 +6173,6 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; }
&& \
done
fi
-# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
-if test "$cpu" = "s390x" ; then
- write_c_skeleton
- if compile_prog "-march=z900" ""; then
- roms="$roms s390-ccw"
- fi
-fi
-
# Probe for the need for relocating the user-only binary.
if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] ) && [ "$pie" = no ];
then
textseg_addr=
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index def68a4..1697c55 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -99,3 +99,8 @@ if dtc.found()
endforeach
alias_target('update-dtb', t)
endif
+
+cc = meson.get_compiler('c')
+if host_machine.cpu_family() == 's390x' and cc.has_argument('-march=z900')
+ subdir('s390-ccw')
+endif
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
deleted file mode 100644
index b512074..0000000
--- a/pc-bios/s390-ccw/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-CURRENT_MAKEFILE := $(realpath $(word $(words
$(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(CURRENT_MAKEFILE))
-TOPSRC_DIR := $(SRC_DIR)/../..
-VPATH = $(SRC_DIR)
-
-all:
-# Dummy command so that make thinks it has done something
- @true
-
-include ../../config-host.mak
-
-quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
-cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/null
2>&1 && echo OK), $1, $2)
-
-override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
-override CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
-override CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
-override CFLAGS += -fno-asynchronous-unwind-tables
-override CFLAGS += $(call cc-option, -fno-stack-protector)
-LDFLAGS += -Wl,-pie -nostdlib
-
-OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
- virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o
-
-STRIP ?= strip
-
-$(OBJECTS): Makefile
-
-SLOF_DIR := $(SRC_PATH)/roms/SLOF
-
-NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \
- libnet.a libc.a
-
-LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
-LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
-
-$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
-
-# libc files:
-
-LIBC_CFLAGS := $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC)
-
-CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
-$(CTYPE_OBJS) : %.o : $(SLOF_DIR)/lib/libc/ctype/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
- strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
- memset.o memcpy.o memmove.o memcmp.o
-$(STRING_OBJS) : %.o : $(SLOF_DIR)/lib/libc/string/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
-$(STDLIB_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
- printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
-$(STDIO_OBJS) : %.o : $(SLOF_DIR)/lib/libc/stdio/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-sbrk.o: $(SLOF_DIR)/slof/sbrk.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
-
-libc.a: $(LIBCOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
-
-# libnet files:
-
-LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
- dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
-LIBNETCFLAGS := $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC)
-
-$(LIBNETOBJS) : %.o : $(SLOF_DIR)/lib/libnet/%.c
- $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@
$<,"CC","$(TARGET_DIR)$@")
-
-libnet.a: $(LIBNETOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
-
-%.elf:
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@
$^,"BUILD","$(TARGET_DIR)$@")
-
-%.img: %.elf
- $(call quiet-command,$(STRIP) --strip-unneeded $< -o
$@,"STRIP","$(TARGET_DIR)$@")
-
-s390-ccw.elf: $(OBJECTS)
-s390-ccw.img: s390-ccw.elf
-all: s390-ccw.img
-
-ifneq ($(wildcard $(SLOF_DIR)/lib/libnet),)
-s390-netboot.elf: $(NETOBJS)
-s390-netboot.elf: LDFLAGS += -Ttext=0x7800000
-
-s390-netboot.img: s390-netboot.elf
-all: s390-netboot.img
-endif
-
-clean:
- rm -f *.o *.d *.img *.elf *~ *.a
-
-.PHONY : all clean
diff --git a/pc-bios/s390-ccw/meson.build b/pc-bios/s390-ccw/meson.build
new file mode 100644
index 0000000..a4e0e3b
--- /dev/null
+++ b/pc-bios/s390-ccw/meson.build
@@ -0,0 +1,175 @@
+strip = find_program('strip')
+cc = meson.get_compiler('c')
+link_args = ['-Wl,-pie', '-nostdlib']
+
+# FIXME: find a better way to check/enable slof
+slof = '../../roms/SLOF'
+has_slof = cc.has_header('libnet/tftp.h', args: '-I' +
meson.current_source_dir() / slof / 'lib')
+
+s390_cargs = [
+ '-ffreestanding',
+ '-fno-delete-null-pointer-checks',
+ '-msoft-float',
+ '-march=z900',
+ '-fPIE',
+ '-fno-strict-aliasing',
+ '-fno-asynchronous-unwind-tables',
+ cc.get_supported_arguments('-fno-stack-protector')
+]
+
+s390_incs = []
+
+s390_srcs = [
+ 'bootmap.c',
+ 'cio.c',
+ 'dasd-ipl.c',
+ 'jump2ipl.c',
+ 'libc.c',
+ 'main.c',
+ 'menu.c',
+ 'sclp.c',
+ 'start.S',
+ 'virtio-blkdev.c',
+ 'virtio-scsi.c',
+ 'virtio.c',
+]
+
+if has_slof
+ s390_srcs += [
+ 'netmain.c',
+ 'virtio-net.c',
+ ]
+ s390_incs += include_directories(slof / 'lib/libnet')
+ s390_incs += include_directories(slof / 'lib/libc/include')
+ s390_cargs += '-nostdinc'
+endif
+
+s390_lib = static_library(
+ 's390', s390_srcs,
+ c_args: s390_cargs,
+ include_directories: s390_incs,
+)
+
+s390_ccw_elf = executable(
+ 's390-ccw.elf',
+ link_args: link_args,
+ objects: s390_lib.extract_objects([
+ 'bootmap.c',
+ 'cio.c',
+ 'dasd-ipl.c',
+ 'jump2ipl.c',
+ 'libc.c',
+ 'main.c',
+ 'menu.c',
+ 'sclp.c',
+ 'start.S',
+ 'virtio-blkdev.c',
+ 'virtio-scsi.c',
+ 'virtio.c',
+ ]),
+)
+
+custom_target(
+ 's390-ccw.img',
+ output: 's390-ccw.img',
+ input: s390_ccw_elf,
+ command: [strip, '--strip-unneeded', '@INPUT@', '-o', '@OUTPUT@'],
+ build_by_default: true,
+)
+
+if has_slof
+ slof_ctype = slof / 'lib/libc/ctype'
+ slof_str = slof / 'lib/libc/string'
+ slof_stdlib = slof / 'lib/libc/stdlib'
+ slof_stdio = slof / 'lib/libc/stdio'
+
+ s390_libc = static_library(
+ 's390-libc', files(
+ slof_ctype / 'isdigit.c',
+ slof_ctype / 'isxdigit.c',
+ slof_ctype / 'toupper.c',
+ slof_str / 'strcat.c',
+ slof_str / 'strchr.c',
+ slof_str / 'strrchr.c',
+ slof_str / 'strcpy.c',
+ slof_str / 'strlen.c',
+ slof_str / 'strncpy.c',
+ slof_str / 'strcmp.c',
+ slof_str / 'strncmp.c',
+ slof_str / 'strcasecmp.c',
+ slof_str / 'strncasecmp.c',
+ slof_str / 'strstr.c',
+ slof_str / 'memset.c',
+ slof_str / 'memcpy.c',
+ slof_str / 'memmove.c',
+ slof_str / 'memcmp.c',
+ slof_stdlib / 'atoi.c',
+ slof_stdlib / 'atol.c',
+ slof_stdlib / 'strtoul.c',
+ slof_stdlib / 'strtol.c',
+ slof_stdlib / 'rand.c',
+ slof_stdlib / 'malloc.c',
+ slof_stdlib / 'free.c',
+ slof_stdio / 'sprintf.c',
+ slof_stdio / 'snprintf.c',
+ slof_stdio / 'vfprintf.c',
+ slof_stdio / 'vsnprintf.c',
+ slof_stdio / 'vsprintf.c',
+ slof_stdio / 'fprintf.c',
+ slof_stdio / 'printf.c',
+ slof_stdio / 'putc.c',
+ slof_stdio / 'puts.c',
+ slof_stdio / 'putchar.c',
+ slof_stdio / 'stdchnls.c',
+ slof_stdio / 'fileno.c',
+ slof / 'slof/sbrk.c',
+ ),
+ c_args: s390_cargs,
+ include_directories: s390_incs,
+ )
+
+ slof_libnet = slof / 'lib/libnet'
+ s390_libnet = static_library(
+ 's390-libnet', files(
+ slof_libnet / 'args.c',
+ slof_libnet / 'dhcp.c',
+ slof_libnet / 'dns.c',
+ slof_libnet / 'icmpv6.c',
+ slof_libnet / 'ipv6.c',
+ slof_libnet / 'tcp.c',
+ slof_libnet / 'udp.c',
+ slof_libnet / 'bootp.c',
+ slof_libnet / 'dhcpv6.c',
+ slof_libnet / 'ethernet.c',
+ slof_libnet / 'ipv4.c',
+ slof_libnet / 'ndp.c',
+ slof_libnet / 'tftp.c',
+ slof_libnet / 'pxelinux.c',
+ ),
+ c_args: [s390_cargs, '-DDHCPARCH=0x1F'],
+ include_directories: s390_incs,
+ )
+
+ s390_netboot_elf = executable(
+ 's390-netboot.elf',
+ link_with: [s390_libc, s390_libnet],
+ link_args: [link_args, '-Ttext=0x7800000'],
+ objects: s390_lib.extract_objects([
+ 'cio.c',
+ 'jump2ipl.c',
+ 'netmain.c',
+ 'sclp.c',
+ 'start.S',
+ 'virtio-net.c',
+ 'virtio.c',
+ ]),
+ )
+
+ custom_target(
+ 's390-netboot.img',
+ output: 's390-netboot.img',
+ input: s390_netboot_elf,
+ command: [strip, '--strip-unneeded', '@INPUT@', '-o', '@OUTPUT@'],
+ build_by_default: true,
+ )
+endif
--
1.8.3.1
