diff options
Diffstat (limited to 'meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch')
-rw-r--r-- | meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch | 176 |
1 files changed, 0 insertions, 176 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch b/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch deleted file mode 100644 index aa61e15c81..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch +++ /dev/null @@ -1,176 +0,0 @@ -From f32126ba790dd4e61d43a2140b24f02426297bb6 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@altlinux.org> -Date: Thu, 31 Dec 2015 14:19:41 +0000 -Subject: [PATCH] Move gcc compat macros to gcc_compat.h - -* defs.h: Include "gcc_compat.h". -(GNUC_PREREQ, ATTRIBUTE_NORETURN, ATTRIBUTE_FORMAT, -ATTRIBUTE_ALIGNED, ATTRIBUTE_PACKED, ATTRIBUTE_MALLOC, -ATTRIBUTE_NOINLINE, ATTRIBUTE_ALLOC_SIZE): Move ... -* gcc_compat.h: ... here. -* Makefile.am (strace_SOURCES): Add gcc_compat.h. ---- -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport - - Makefile.am | 1 + - defs.h | 43 +---------------------------------- - gcc_compat.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 75 insertions(+), 42 deletions(-) - create mode 100644 gcc_compat.h - -diff --git a/Makefile.am b/Makefile.am -index ab52778..d43608d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -97,6 +97,7 @@ strace_SOURCES = \ - flock.c \ - flock.h \ - futex.c \ -+ gcc_compat.h \ - get_robust_list.c \ - getcpu.c \ - getcwd.c \ -diff --git a/defs.h b/defs.h -index 283ab1f..bae212c 100644 ---- a/defs.h -+++ b/defs.h -@@ -55,6 +55,7 @@ - #include <sys/syscall.h> - - #include "mpers_type.h" -+#include "gcc_compat.h" - - #ifndef HAVE_STRERROR - const char *strerror(int); -@@ -68,48 +69,6 @@ const char *strerror(int); - extern char *stpcpy(char *dst, const char *src); - #endif - --#if defined __GNUC__ && defined __GNUC_MINOR__ --# define GNUC_PREREQ(maj, min) \ -- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) --#else --# define __attribute__(x) /* empty */ --# define GNUC_PREREQ(maj, min) 0 --#endif -- --#if GNUC_PREREQ(2, 5) --# define ATTRIBUTE_NORETURN __attribute__((__noreturn__)) --#else --# define ATTRIBUTE_NORETURN /* empty */ --#endif -- --#if GNUC_PREREQ(2, 7) --# define ATTRIBUTE_FORMAT(args) __attribute__((__format__ args)) --# define ATTRIBUTE_ALIGNED(arg) __attribute__((__aligned__(arg))) --# define ATTRIBUTE_PACKED __attribute__((__packed__)) --#else --# define ATTRIBUTE_FORMAT(args) /* empty */ --# define ATTRIBUTE_ALIGNED(arg) /* empty */ --# define ATTRIBUTE_PACKED /* empty */ --#endif -- --#if GNUC_PREREQ(3, 0) --# define ATTRIBUTE_MALLOC __attribute__((__malloc__)) --#else --# define ATTRIBUTE_MALLOC /* empty */ --#endif -- --#if GNUC_PREREQ(3, 1) --# define ATTRIBUTE_NOINLINE __attribute__((__noinline__)) --#else --# define ATTRIBUTE_NOINLINE /* empty */ --#endif -- --#if GNUC_PREREQ(4, 3) --# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__((__alloc_size__ args)) --#else --# define ATTRIBUTE_ALLOC_SIZE(args) /* empty */ --#endif -- - #ifndef offsetof - # define offsetof(type, member) \ - (((char *) &(((type *) NULL)->member)) - ((char *) (type *) NULL)) -diff --git a/gcc_compat.h b/gcc_compat.h -new file mode 100644 -index 0000000..1f2c835 ---- /dev/null -+++ b/gcc_compat.h -@@ -0,0 +1,73 @@ -+/* -+ * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org> -+ * 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. -+ */ -+ -+#ifndef GCC_COMPAT_H_ -+#define GCC_COMPAT_H_ -+ -+#if defined __GNUC__ && defined __GNUC_MINOR__ -+# define GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#else -+# define __attribute__(x) /* empty */ -+# define GNUC_PREREQ(maj, min) 0 -+#endif -+ -+#if GNUC_PREREQ(2, 5) -+# define ATTRIBUTE_NORETURN __attribute__((__noreturn__)) -+#else -+# define ATTRIBUTE_NORETURN /* empty */ -+#endif -+ -+#if GNUC_PREREQ(2, 7) -+# define ATTRIBUTE_FORMAT(args) __attribute__((__format__ args)) -+# define ATTRIBUTE_ALIGNED(arg) __attribute__((__aligned__(arg))) -+# define ATTRIBUTE_PACKED __attribute__((__packed__)) -+#else -+# define ATTRIBUTE_FORMAT(args) /* empty */ -+# define ATTRIBUTE_ALIGNED(arg) /* empty */ -+# define ATTRIBUTE_PACKED /* empty */ -+#endif -+ -+#if GNUC_PREREQ(3, 0) -+# define ATTRIBUTE_MALLOC __attribute__((__malloc__)) -+#else -+# define ATTRIBUTE_MALLOC /* empty */ -+#endif -+ -+#if GNUC_PREREQ(3, 1) -+# define ATTRIBUTE_NOINLINE __attribute__((__noinline__)) -+#else -+# define ATTRIBUTE_NOINLINE /* empty */ -+#endif -+ -+#if GNUC_PREREQ(4, 3) -+# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__((__alloc_size__ args)) -+#else -+# define ATTRIBUTE_ALLOC_SIZE(args) /* empty */ -+#endif -+ -+#endif --- -1.9.1 - |