mgl@1986: Fix for canadian cross build of sim/ppc mgl@1986: mgl@1986: Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638 mgl@1986: mgl@1986: diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in mgl@1986: --- gdb-6.8-pl1/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 mgl@1986: +++ gdb-6.8-pl2/sim/ppc/Makefile.in 2008-09-30 15:56:33.000000000 +0200 mgl@1986: @@ -61,7 +61,7 @@ mgl@1986: AR = @AR@ mgl@1986: AR_FLAGS = rc mgl@1986: CC = @CC@ mgl@1986: -CFLAGS = @CFLAGS@ mgl@1986: +CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H mgl@1986: CC_FOR_BUILD = @CC_FOR_BUILD@ mgl@1986: CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ mgl@1986: BISON = bison mgl@1986: @@ -115,8 +115,8 @@ mgl@1986: $(DEVZERO_CFLAGS) mgl@1986: SIM_FPU_CFLAGS = @sim_fpu_cflags@ mgl@1986: mgl@1986: -STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) mgl@1986: -NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) mgl@1986: +STD_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) mgl@1986: +NOWARN_CFLAGS = $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) mgl@1986: BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) mgl@1986: mgl@1986: BUILD_LDFLAGS = mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h mgl@1986: --- gdb-6.8-orig/sim/ppc/basics.h 1999-04-16 03:35:08.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/basics.h 2008-09-30 15:12:32.000000000 +0200 mgl@1986: @@ -86,7 +86,9 @@ mgl@1986: mgl@1986: /* Basic configuration */ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "ppc-config.h" mgl@1986: #include "inline.h" mgl@1986: mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c mgl@1986: --- gdb-6.8-orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/debug.c 2008-09-30 15:12:27.000000000 +0200 mgl@1986: @@ -22,7 +22,9 @@ mgl@1986: #ifndef _DEBUG_C_ mgl@1986: #define _DEBUG_C_ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "basics.h" mgl@1986: mgl@1986: #ifdef HAVE_STDLIB_H mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c mgl@1986: --- gdb-6.8-orig/sim/ppc/dgen.c 1999-04-16 03:35:08.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/dgen.c 2008-09-30 15:12:22.000000000 +0200 mgl@1986: @@ -27,7 +27,9 @@ mgl@1986: #include mgl@1986: #include mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "misc.h" mgl@1986: #include "lf.h" mgl@1986: #include "table.h" mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c mgl@1986: --- gdb-6.8-orig/sim/ppc/filter.c 1999-04-16 03:35:09.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/filter.c 2008-09-30 15:12:15.000000000 +0200 mgl@1986: @@ -21,7 +21,9 @@ mgl@1986: mgl@1986: #include mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: mgl@1986: #ifdef HAVE_STRING_H mgl@1986: #include mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c mgl@1986: --- gdb-6.8-orig/sim/ppc/filter_filename.c 1999-04-16 03:35:08.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/filter_filename.c 2008-09-30 15:12:11.000000000 +0200 mgl@1986: @@ -18,7 +18,9 @@ mgl@1986: mgl@1986: */ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "ppc-config.h" mgl@1986: #include "filter_filename.h" mgl@1986: mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c mgl@1986: --- gdb-6.8-orig/sim/ppc/igen.c 2003-06-20 05:59:33.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/igen.c 2008-09-30 15:12:06.000000000 +0200 mgl@1986: @@ -25,7 +25,9 @@ mgl@1986: #include "misc.h" mgl@1986: #include "lf.h" mgl@1986: #include "table.h" mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: mgl@1986: #include "filter.h" mgl@1986: mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c mgl@1986: --- gdb-6.8-orig/sim/ppc/inline.c 1999-04-16 03:35:10.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/inline.c 2008-09-30 15:11:58.000000000 +0200 mgl@1986: @@ -22,7 +22,9 @@ mgl@1986: #ifndef _INLINE_C_ mgl@1986: #define _INLINE_C_ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "ppc-config.h" mgl@1986: mgl@1986: #include "inline.h" mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c mgl@1986: --- gdb-6.8-orig/sim/ppc/lf.c 2002-05-30 17:07:06.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/lf.c 2008-09-30 15:33:35.000000000 +0200 mgl@1986: @@ -23,7 +23,9 @@ mgl@1986: #include mgl@1986: #include mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "misc.h" mgl@1986: #include "lf.h" mgl@1986: mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c mgl@1986: --- gdb-6.8-orig/sim/ppc/misc.c 1999-04-16 03:35:11.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/misc.c 2008-09-30 15:11:54.000000000 +0200 mgl@1986: @@ -23,7 +23,9 @@ mgl@1986: #include mgl@1986: #include mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "misc.h" mgl@1986: mgl@1986: #ifdef HAVE_STDLIB_H mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h mgl@1986: --- gdb-6.8-orig/sim/ppc/misc.h 2002-01-12 11:21:12.000000000 +0100 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/misc.h 2008-09-30 15:11:49.000000000 +0200 mgl@1986: @@ -21,7 +21,9 @@ mgl@1986: mgl@1986: /* Frustrating header junk */ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: mgl@1986: #include mgl@1986: #include mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c mgl@1986: --- gdb-6.8-orig/sim/ppc/sim-endian.c 1999-04-16 03:35:11.000000000 +0200 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/sim-endian.c 2008-09-30 15:11:44.000000000 +0200 mgl@1986: @@ -22,7 +22,9 @@ mgl@1986: #ifndef _SIM_ENDIAN_C_ mgl@1986: #define _SIM_ENDIAN_C_ mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "basics.h" mgl@1986: mgl@1986: mgl@1986: diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c mgl@1986: --- gdb-6.8-orig/sim/ppc/table.c 2002-01-12 11:21:12.000000000 +0100 mgl@1986: +++ gdb-6.8-pl1/sim/ppc/table.c 2008-09-30 15:11:38.000000000 +0200 mgl@1986: @@ -25,7 +25,9 @@ mgl@1986: #include mgl@1986: #include mgl@1986: mgl@1986: +#ifdef HAVE_CONFIG_H mgl@1986: #include "config.h" mgl@1986: +#endif mgl@1986: #include "misc.h" mgl@1986: #include "lf.h" mgl@1986: #include "table.h"