From c9da35e4b4df2cb92cdba49d85812e09135448db Mon Sep 17 00:00:00 2001 From: "Lev A. Serebryakov" Date: Thu, 2 Feb 2017 16:10:01 +0000 Subject: [PATCH] (1) Add patch from devel/gdb to fix build on 11-RELEASE (but 11-STABLE doesn't have this problem). (2) Regenerate and rename patches. --- ...-arm--arm.h => patch-src_gcc_gcc_config_arm_arm.h} | 6 +++--- .../files/patch-src_gdb_gdb_gnulib_import_stddef.in.h | 11 +++++++++++ ...g.py => patch-src_gdb_gdb_python_python-config.py} | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) rename devel/gcc-arm-embedded/files/{patch-src--gcc--gcc--config--arm--arm.h => patch-src_gcc_gcc_config_arm_arm.h} (62%) create mode 100644 devel/gcc-arm-embedded/files/patch-src_gdb_gdb_gnulib_import_stddef.in.h rename devel/gcc-arm-embedded/files/{patch-src--gdb--gdb--python--python-config.py => patch-src_gdb_gdb_python_python-config.py} (67%) diff --git a/devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h similarity index 62% rename from devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h rename to devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h index e756fd9cc73b..349d32bb1aa3 100644 --- a/devel/gcc-arm-embedded/files/patch-src--gcc--gcc--config--arm--arm.h +++ b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h @@ -1,6 +1,6 @@ ---- src/gcc/gcc/config/arm/arm.h.orig 2016-03-30 20:55:09.000000000 +0300 -+++ src/gcc/gcc/config/arm/arm.h 2016-04-19 22:13:19.910442000 +0300 -@@ -2414,7 +2414,7 @@ extern const char *arm_rewrite_mcpu (int +--- src/gcc/gcc/config/arm/arm.h.orig 2016-12-05 16:07:09 UTC ++++ src/gcc/gcc/config/arm/arm.h +@@ -2273,7 +2273,7 @@ extern const char *arm_target_thumb_only /* -mcpu=native handling only makes sense with compiler running on an ARM chip. */ diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_gnulib_import_stddef.in.h b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_gnulib_import_stddef.in.h new file mode 100644 index 000000000000..c97a923317ac --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_gnulib_import_stddef.in.h @@ -0,0 +1,11 @@ +--- src/gdb/gdb/gnulib/import/stddef.in.h.orig 2015-08-26 16:08:17 UTC ++++ src/gdb/gdb/gnulib/import/stddef.in.h +@@ -82,7 +82,7 @@ + #endif + + /* Some platforms lack max_align_t. */ +-#if !@HAVE_MAX_ALIGN_T@ ++#if 0 + /* On the x86, the maximum storage alignment of double, long, etc. is 4, + but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, + and the C11 standard allows this. Work around this problem by diff --git a/devel/gcc-arm-embedded/files/patch-src--gdb--gdb--python--python-config.py b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py similarity index 67% rename from devel/gcc-arm-embedded/files/patch-src--gdb--gdb--python--python-config.py rename to devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py index 066886e59e3f..b181e7993c13 100644 --- a/devel/gcc-arm-embedded/files/patch-src--gdb--gdb--python--python-config.py +++ b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py @@ -1,5 +1,5 @@ ---- src/gdb/gdb/python/python-config.py.orig 2015-11-19 18:54:06.000000000 +0300 -+++ src/gdb/gdb/python/python-config.py 2016-04-20 01:07:39.352468000 +0300 +--- src/gdb/gdb/python/python-config.py.orig 2015-04-14 04:27:11 UTC ++++ src/gdb/gdb/python/python-config.py @@ -58,7 +58,7 @@ for opt in opt_flags: print (to_unix_path(' '.join(flags)))