From 5679fad7a05a81e44cb247dea82c303d5b57c3c8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 12 Jan 2017 13:15:59 -0800 Subject: [PATCH] ioctlsort: get ioctl definitions from host, not build When cross-compiling, ioctlsort must obtain _IOC_* values from the host, build's values may be incompatible. * ioctl_iocdef.c: New file. * Makefile.am (EXTRA_DIST): Add it. (ioctl_iocdef.i, ioctl_iocdef.h): New rules. (ioctlsort%.o): Depend on ioctl_iocdef.h. (CLEANFILES): Add ioctl_iocdef.h and ioctl_iocdef.i. * ioctlsort.c: Include "ioctl_iocdef.h" instead of . Signed-off-by: Alexey Neyman Signed-off-by: Dmitry V. Levin --- Makefile.am | 13 ++++++++++++- ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++ ioctlsort.c | 3 ++- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 ioctl_iocdef.c diff --git a/Makefile.am b/Makefile.am index 25caf9a6..afc3dd22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -303,6 +303,7 @@ EXTRA_DIST = \ debian/watch \ errnoent.sh \ generate_sen.sh \ + ioctl_iocdef.c \ ioctlsort.c \ linux/32/ioctls_inc.h \ linux/32/ioctls_inc_align16.h \ @@ -824,10 +825,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h ioctlent%.h: ioctlsort% ./$< > $@ +# Need to pick up definitions *for host* while compiling +# ioctlsort *for build*, hence this magic. +ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c + $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ + +ioctl_iocdef.h: ioctl_iocdef.i + sed -n 's/^DEFINE HOST/#define /p' $< > $@ + ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ -ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c +ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h @@ -836,6 +846,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioc BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \ native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ + ioctl_iocdef.h ioctl_iocdef.i \ native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h diff --git a/ioctl_iocdef.c b/ioctl_iocdef.c new file mode 100644 index 00000000..accbbedd --- /dev/null +++ b/ioctl_iocdef.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2017 Alexey Neyman + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * This file is *PREPROCESSED*, not *COMPILED* for host and the result + * is included into ioctlsort (which is compiled for build). Since some + * of these values are used in structure initializers, they cannot be + * defined as 'const unsigned int' - instead, they have to be macros. + * Hence, the result of preprocessing will be run through sed to change + * 'DEFINE' into '#define' + */ +#include + +DEFINE HOST_IOC_NONE _IOC_NONE +DEFINE HOST_IOC_READ _IOC_READ +DEFINE HOST_IOC_WRITE _IOC_WRITE + +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT diff --git a/ioctlsort.c b/ioctlsort.c index 9c316910..079f21e5 100644 --- a/ioctlsort.c +++ b/ioctlsort.c @@ -33,7 +33,8 @@ #include #include #include -#include + +#include "ioctl_iocdef.h" struct ioctlent { const char *info; -- 2.40.0