From 98bc4decdeab1361bdc585c86591718fb08c8ffb Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 2 Dec 2017 12:44:39 -0800 Subject: Run all patches through renumbering and update Signed-off-by: Alexey Neyman --- .../gdb/7.0.1a/0000-sim-ppc-have-config-h.patch | 186 +++++++++++++++++++++ .../gdb/7.0.1a/100-sim-ppc-have-config-h.patch | 183 -------------------- 2 files changed, 186 insertions(+), 183 deletions(-) create mode 100644 packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch delete mode 100644 packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch (limited to 'packages/gdb/7.0.1a') diff --git a/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch new file mode 100644 index 00000000..2d068e7a --- /dev/null +++ b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch @@ -0,0 +1,186 @@ +Fix for canadian cross build of sim/ppc + +Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638 + +--- + sim/ppc/Makefile.in | 6 +++--- + sim/ppc/basics.h | 2 ++ + sim/ppc/debug.c | 2 ++ + sim/ppc/dgen.c | 2 ++ + sim/ppc/filter.c | 2 ++ + sim/ppc/filter_filename.c | 2 ++ + sim/ppc/igen.c | 2 ++ + sim/ppc/inline.c | 2 ++ + sim/ppc/lf.c | 2 ++ + sim/ppc/misc.c | 2 ++ + sim/ppc/misc.h | 2 ++ + sim/ppc/sim-endian.c | 2 ++ + sim/ppc/table.c | 2 ++ + 13 files changed, 27 insertions(+), 3 deletions(-) + +--- a/sim/ppc/Makefile.in ++++ b/sim/ppc/Makefile.in +@@ -62,7 +62,7 @@ + AR = @AR@ + AR_FLAGS = rc + CC = @CC@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + BISON = bison +@@ -116,8 +116,8 @@ + $(DEVZERO_CFLAGS) + SIM_FPU_CFLAGS = @sim_fpu_cflags@ + +-STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) +-NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) ++STD_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) ++NOWARN_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) + BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) + + BUILD_LDFLAGS = +--- a/sim/ppc/basics.h ++++ b/sim/ppc/basics.h +@@ -86,7 +86,9 @@ + + /* Basic configuration */ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "ppc-config.h" + #include "inline.h" + +--- a/sim/ppc/debug.c ++++ b/sim/ppc/debug.c +@@ -22,7 +22,9 @@ + #ifndef _DEBUG_C_ + #define _DEBUG_C_ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "basics.h" + + #ifdef HAVE_STDLIB_H +--- a/sim/ppc/dgen.c ++++ b/sim/ppc/dgen.c +@@ -27,7 +27,9 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "misc.h" + #include "lf.h" + #include "table.h" +--- a/sim/ppc/filter.c ++++ b/sim/ppc/filter.c +@@ -21,7 +21,9 @@ + + #include + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #ifdef HAVE_STRING_H + #include +--- a/sim/ppc/filter_filename.c ++++ b/sim/ppc/filter_filename.c +@@ -18,7 +18,9 @@ + + */ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "ppc-config.h" + #include "filter_filename.h" + +--- a/sim/ppc/igen.c ++++ b/sim/ppc/igen.c +@@ -25,7 +25,9 @@ + #include "misc.h" + #include "lf.h" + #include "table.h" ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #include "filter.h" + +--- a/sim/ppc/inline.c ++++ b/sim/ppc/inline.c +@@ -22,7 +22,9 @@ + #ifndef _INLINE_C_ + #define _INLINE_C_ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "ppc-config.h" + + #include "inline.h" +--- a/sim/ppc/lf.c ++++ b/sim/ppc/lf.c +@@ -23,7 +23,9 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "misc.h" + #include "lf.h" + +--- a/sim/ppc/misc.c ++++ b/sim/ppc/misc.c +@@ -23,7 +23,9 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "misc.h" + + #ifdef HAVE_STDLIB_H +--- a/sim/ppc/misc.h ++++ b/sim/ppc/misc.h +@@ -21,7 +21,9 @@ + + /* Frustrating header junk */ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #include + #include +--- a/sim/ppc/sim-endian.c ++++ b/sim/ppc/sim-endian.c +@@ -22,7 +22,9 @@ + #ifndef _SIM_ENDIAN_C_ + #define _SIM_ENDIAN_C_ + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "basics.h" + + +--- a/sim/ppc/table.c ++++ b/sim/ppc/table.c +@@ -25,7 +25,9 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + #include "misc.h" + #include "lf.h" + #include "table.h" diff --git a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch deleted file mode 100644 index f3723b57..00000000 --- a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch +++ /dev/null @@ -1,183 +0,0 @@ -Fix for canadian cross build of sim/ppc - -Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638 - -diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in ---- gdb-6.8-pl1/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8-pl2/sim/ppc/Makefile.in 2008-09-30 15:56:33.000000000 +0200 -@@ -61,7 +61,7 @@ - AR = @AR@ - AR_FLAGS = rc - CC = @CC@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H - CC_FOR_BUILD = @CC_FOR_BUILD@ - CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - BISON = bison -@@ -115,8 +115,8 @@ - $(DEVZERO_CFLAGS) - SIM_FPU_CFLAGS = @sim_fpu_cflags@ - --STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) --NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) -+STD_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) -+NOWARN_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) - BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) - - BUILD_LDFLAGS = -diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h ---- gdb-6.8-orig/sim/ppc/basics.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/basics.h 2008-09-30 15:12:32.000000000 +0200 -@@ -86,7 +86,9 @@ - - /* Basic configuration */ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "ppc-config.h" - #include "inline.h" - -diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c ---- gdb-6.8-orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/debug.c 2008-09-30 15:12:27.000000000 +0200 -@@ -22,7 +22,9 @@ - #ifndef _DEBUG_C_ - #define _DEBUG_C_ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "basics.h" - - #ifdef HAVE_STDLIB_H -diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c ---- gdb-6.8-orig/sim/ppc/dgen.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/dgen.c 2008-09-30 15:12:22.000000000 +0200 -@@ -27,7 +27,9 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "misc.h" - #include "lf.h" - #include "table.h" -diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c ---- gdb-6.8-orig/sim/ppc/filter.c 1999-04-16 03:35:09.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/filter.c 2008-09-30 15:12:15.000000000 +0200 -@@ -21,7 +21,9 @@ - - #include - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - - #ifdef HAVE_STRING_H - #include -diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c ---- gdb-6.8-orig/sim/ppc/filter_filename.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/filter_filename.c 2008-09-30 15:12:11.000000000 +0200 -@@ -18,7 +18,9 @@ - - */ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "ppc-config.h" - #include "filter_filename.h" - -diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c ---- gdb-6.8-orig/sim/ppc/igen.c 2003-06-20 05:59:33.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/igen.c 2008-09-30 15:12:06.000000000 +0200 -@@ -25,7 +25,9 @@ - #include "misc.h" - #include "lf.h" - #include "table.h" -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - - #include "filter.h" - -diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c ---- gdb-6.8-orig/sim/ppc/inline.c 1999-04-16 03:35:10.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/inline.c 2008-09-30 15:11:58.000000000 +0200 -@@ -22,7 +22,9 @@ - #ifndef _INLINE_C_ - #define _INLINE_C_ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "ppc-config.h" - - #include "inline.h" -diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c ---- gdb-6.8-orig/sim/ppc/lf.c 2002-05-30 17:07:06.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/lf.c 2008-09-30 15:33:35.000000000 +0200 -@@ -23,7 +23,9 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "misc.h" - #include "lf.h" - -diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c ---- gdb-6.8-orig/sim/ppc/misc.c 1999-04-16 03:35:11.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/misc.c 2008-09-30 15:11:54.000000000 +0200 -@@ -23,7 +23,9 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "misc.h" - - #ifdef HAVE_STDLIB_H -diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h ---- gdb-6.8-orig/sim/ppc/misc.h 2002-01-12 11:21:12.000000000 +0100 -+++ gdb-6.8-pl1/sim/ppc/misc.h 2008-09-30 15:11:49.000000000 +0200 -@@ -21,7 +21,9 @@ - - /* Frustrating header junk */ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - - #include - #include -diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c ---- gdb-6.8-orig/sim/ppc/sim-endian.c 1999-04-16 03:35:11.000000000 +0200 -+++ gdb-6.8-pl1/sim/ppc/sim-endian.c 2008-09-30 15:11:44.000000000 +0200 -@@ -22,7 +22,9 @@ - #ifndef _SIM_ENDIAN_C_ - #define _SIM_ENDIAN_C_ - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "basics.h" - - -diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c ---- gdb-6.8-orig/sim/ppc/table.c 2002-01-12 11:21:12.000000000 +0100 -+++ gdb-6.8-pl1/sim/ppc/table.c 2008-09-30 15:11:38.000000000 +0200 -@@ -25,7 +25,9 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H - #include "config.h" -+#endif - #include "misc.h" - #include "lf.h" - #include "table.h" -- cgit v1.2.3