mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-22 22:22:23 +00:00
143 lines
5.9 KiB
Diff
143 lines
5.9 KiB
Diff
diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
|
|
--- strace-4.10.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800
|
|
+++ strace-4.10/ioctl_iocdef.c 2017-01-14 15:05:49.505335680 -0800
|
|
@@ -0,0 +1,43 @@
|
|
+/*
|
|
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
|
|
+ * 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 <linux/ioctl.h>
|
|
+
|
|
+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 -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
|
|
--- strace-4.10.orig/ioctlsort.c 2015-02-15 18:35:58.000000000 -0800
|
|
+++ strace-4.10/ioctlsort.c 2017-01-14 15:20:30.597371979 -0800
|
|
@@ -33,7 +33,8 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
-#include <linux/ioctl.h>
|
|
+
|
|
+#include "ioctl_iocdef.h"
|
|
|
|
struct ioctlent {
|
|
const char *info;
|
|
diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
|
|
--- strace-4.10.orig/Makefile.am 2015-03-05 18:19:01.000000000 -0800
|
|
+++ strace-4.10/Makefile.am 2017-01-14 15:07:28.978244260 -0800
|
|
@@ -159,6 +159,7 @@ EXTRA_DIST = \
|
|
debian/strace64.manpages \
|
|
debian/watch \
|
|
errnoent.sh \
|
|
+ ioctl_iocdef.c \
|
|
ioctlsort.c \
|
|
linux/32/ioctls_inc.h \
|
|
linux/32/syscallent.h \
|
|
@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL
|
|
ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
|
|
ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
|
|
BUILT_SOURCES += $(ioctlent_h)
|
|
-CLEANFILES = $(ioctlent_h)
|
|
+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
|
|
|
|
ioctlent%.h: ioctlsort%
|
|
./$< > $@
|
|
|
|
+# Need to pick up <linux/ioctl.h> 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
|
|
diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
|
|
--- strace-4.10.orig/Makefile.in 2015-03-06 07:16:46.000000000 -0800
|
|
+++ strace-4.10/Makefile.in 2017-01-14 15:23:06.718794409 -0800
|
|
@@ -687,6 +687,7 @@ EXTRA_DIST = \
|
|
debian/strace64.manpages \
|
|
debian/watch \
|
|
errnoent.sh \
|
|
+ ioctl_iocdef.c \
|
|
ioctlsort.c \
|
|
linux/32/ioctls_inc.h \
|
|
linux/32/syscallent.h \
|
|
@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS
|
|
ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
|
|
ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
|
|
ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
|
|
-CLEANFILES = $(ioctlent_h)
|
|
+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
|
|
@MAINTAINER_MODE_TRUE@gen_changelog_start_date = 2009-07-08 20:00
|
|
all: $(BUILT_SOURCES) config.h
|
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
@@ -3414,13 +3415,22 @@ news-check: NEWS
|
|
exit 1; \
|
|
fi
|
|
|
|
+# Need to pick up <linux/ioctl.h> 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' $< > $@
|
|
+
|
|
ioctlent%.h: ioctlsort%
|
|
./$< > $@
|
|
|
|
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
|