* 6.1: Use cconfig.h instead of config.h in sim/common [resend]
@ 2004-04-20 15:00 Maciej W. Rozycki
2004-05-10 16:48 ` Daniel Jacobowitz
0 siblings, 1 reply; 5+ messages in thread
From: Maciej W. Rozycki @ 2004-04-20 15:00 UTC (permalink / raw)
To: gdb-patches
Hello,
Despite:
http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
the following patch hasn't been applied. What's wrong with it?
2004-04-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
* callback.c: Include cconfig.h instead of config.h.
* run.c: Likewise.
* sim-basics.h: Likewise.
* sim-load.c: Likewise.
* syscall.c: Likewise.
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
gdb-6.0-sim-cconfig.patch
diff -up --recursive --new-file gdb-6.0.macro/sim/common/callback.c gdb-6.0/sim/common/callback.c
--- gdb-6.0.macro/sim/common/callback.c 2002-06-09 15:45:45.000000000 +0000
+++ gdb-6.0/sim/common/callback.c 2003-11-09 01:07:33.000000000 +0000
@@ -22,7 +22,7 @@
level. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
#include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
diff -up --recursive --new-file gdb-6.0.macro/sim/common/run.c gdb-6.0/sim/common/run.c
--- gdb-6.0.macro/sim/common/run.c 2003-06-05 02:17:29.000000000 +0000
+++ gdb-6.0/sim/common/run.c 2003-11-16 19:09:07.000000000 +0000
@@ -18,8 +18,10 @@ with this program; if not, write to the
/* Steve Chamberlain sac@cygnus.com,
and others at Cygnus. */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
#include "tconfig.h"
+#endif
#include <signal.h>
#include <stdio.h>
diff -up --recursive --new-file gdb-6.0.macro/sim/common/sim-basics.h gdb-6.0/sim/common/sim-basics.h
--- gdb-6.0.macro/sim/common/sim-basics.h 2002-11-23 01:12:05.000000000 +0000
+++ gdb-6.0/sim/common/sim-basics.h 2003-11-09 01:06:45.000000000 +0000
@@ -29,7 +29,7 @@
/* Basic configuration */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
/* Basic host dependant mess - hopefully <stdio.h> + <stdarg.h> will
diff -up --recursive --new-file gdb-6.0.macro/sim/common/sim-load.c gdb-6.0/sim/common/sim-load.c
--- gdb-6.0.macro/sim/common/sim-load.c 2002-06-09 15:45:45.000000000 +0000
+++ gdb-6.0/sim/common/sim-load.c 2003-11-09 01:09:52.000000000 +0000
@@ -19,7 +19,9 @@ along with this program; if not, write t
as it is used by simulators that don't use it [though that doesn't mean
to suggest that they shouldn't :-)]. */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
#ifdef ANSI_PROTOTYPES
diff -up --recursive --new-file gdb-6.0.macro/sim/common/syscall.c gdb-6.0/sim/common/syscall.c
--- gdb-6.0.macro/sim/common/syscall.c 2002-06-09 15:45:45.000000000 +0000
+++ gdb-6.0/sim/common/syscall.c 2003-11-09 01:10:04.000000000 +0000
@@ -25,7 +25,7 @@
supported. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
#include "ansidecl.h"
#include "libiberty.h"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 6.1: Use cconfig.h instead of config.h in sim/common [resend]
2004-04-20 15:00 6.1: Use cconfig.h instead of config.h in sim/common [resend] Maciej W. Rozycki
@ 2004-05-10 16:48 ` Daniel Jacobowitz
2004-05-10 20:22 ` Andrew Cagney
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Jacobowitz @ 2004-05-10 16:48 UTC (permalink / raw)
To: Maciej W. Rozycki; +Cc: gdb-patches
On Tue, Apr 20, 2004 at 05:00:21PM +0200, Maciej W. Rozycki wrote:
> Hello,
>
> Despite:
>
> http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
>
> the following patch hasn't been applied. What's wrong with it?
>
> 2004-04-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
>
> * callback.c: Include cconfig.h instead of config.h.
> * run.c: Likewise.
> * sim-basics.h: Likewise.
> * sim-load.c: Likewise.
> * syscall.c: Likewise.
Nothing, it just got forgotten. I've checked in this.
--
Daniel Jacobowitz
2004-05-10 Daniel Jacobowitz <dan@debian.org>
* callback.c: Update copyright dates.
* run.c: Likewise.
* sim-basics.h: Likewise.
* sim-load.c: Likewise.
* syscall.c: Likewise.
2004-05-10 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
* callback.c: Include cconfig.h instead of config.h.
* run.c: Likewise.
* sim-basics.h: Likewise.
* sim-load.c: Likewise.
* syscall.c: Likewise.
Index: sim/common/callback.c
===================================================================
RCS file: /cvs/src/src/sim/common/callback.c,v
retrieving revision 1.7
diff -u -p -r1.7 callback.c
--- sim/common/callback.c 21 Oct 2003 20:41:43 -0000 1.7
+++ sim/common/callback.c 10 May 2004 16:13:59 -0000
@@ -1,5 +1,6 @@
/* Remote target callback routines.
- Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 1997, 2000, 2002, 2003, 2004
+ Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of GDB.
@@ -22,7 +23,7 @@
level. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
#include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
Index: sim/common/run.c
===================================================================
RCS file: /cvs/src/src/sim/common/run.c,v
retrieving revision 1.14
diff -u -p -r1.14 run.c
--- sim/common/run.c 5 Jun 2003 02:17:29 -0000 1.14
+++ sim/common/run.c 10 May 2004 16:13:59 -0000
@@ -1,5 +1,6 @@
/* run front end support for all the simulators.
- Copyright (C) 1992, 93-96, 1997, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,8 +19,10 @@ with this program; if not, write to the
/* Steve Chamberlain sac@cygnus.com,
and others at Cygnus. */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
#include "tconfig.h"
+#endif
#include <signal.h>
#include <stdio.h>
Index: sim/common/sim-basics.h
===================================================================
RCS file: /cvs/src/src/sim/common/sim-basics.h,v
retrieving revision 1.3
diff -u -p -r1.3 sim-basics.h
--- sim/common/sim-basics.h 23 Nov 2002 01:12:05 -0000 1.3
+++ sim/common/sim-basics.h 10 May 2004 16:13:59 -0000
@@ -1,6 +1,6 @@
/* The common simulator framework for GDB, the GNU Debugger.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright 2002, 2004 Free Software Foundation, Inc.
Contributed by Andrew Cagney and Red Hat.
@@ -29,7 +29,7 @@
/* Basic configuration */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
/* Basic host dependant mess - hopefully <stdio.h> + <stdarg.h> will
Index: sim/common/sim-load.c
===================================================================
RCS file: /cvs/src/src/sim/common/sim-load.c,v
retrieving revision 1.5
diff -u -p -r1.5 sim-load.c
--- sim/common/sim-load.c 9 Jun 2002 15:45:45 -0000 1.5
+++ sim/common/sim-load.c 10 May 2004 16:13:59 -0000
@@ -1,5 +1,5 @@
/* Utility to load a file into the simulator.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@ along with this program; if not, write t
as it is used by simulators that don't use it [though that doesn't mean
to suggest that they shouldn't :-)]. */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
#ifdef ANSI_PROTOTYPES
Index: sim/common/syscall.c
===================================================================
RCS file: /cvs/src/src/sim/common/syscall.c,v
retrieving revision 1.2
diff -u -p -r1.2 syscall.c
--- sim/common/syscall.c 9 Jun 2002 15:45:45 -0000 1.2
+++ sim/common/syscall.c 10 May 2004 16:13:59 -0000
@@ -1,5 +1,5 @@
/* Remote target system call support.
- Copyright 1997, 1998 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of GDB.
@@ -25,7 +25,7 @@
supported. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
#endif
#include "ansidecl.h"
#include "libiberty.h"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 6.1: Use cconfig.h instead of config.h in sim/common [resend]
2004-05-10 16:48 ` Daniel Jacobowitz
@ 2004-05-10 20:22 ` Andrew Cagney
2004-05-10 20:48 ` Daniel Jacobowitz
2004-05-10 20:48 ` Daniel Jacobowitz
0 siblings, 2 replies; 5+ messages in thread
From: Andrew Cagney @ 2004-05-10 20:22 UTC (permalink / raw)
To: Daniel Jacobowitz; +Cc: Maciej W. Rozycki, gdb-patches
On Tue, Apr 20, 2004 at 05:00:21PM +0200, Maciej W. Rozycki wrote:
Hello,
Despite:
http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
the following patch hasn't been applied. What's wrong with it?
2004-04-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
* callback.c: Include cconfig.h instead of config.h.
* run.c: Likewise.
* sim-basics.h: Likewise.
* sim-load.c: Likewise.
* syscall.c: Likewise.
Nothing, it just got forgotten. I've checked in this.
Did the cross targets build? I can't build powerpc as either a native
or cross.
/home/cygnus/cagney/GDB/src/sim/common/callback.c:26:21: cconfig.h: No
such file or directory
In file included from /home/cygnus/cagney/GDB/src/sim/common/sim-fpu.c:47:
/home/cygnus/cagney/GDB/src/sim/common/sim-basics.h:32:21: cconfig.h: No
such file or directory
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 6.1: Use cconfig.h instead of config.h in sim/common [resend]
2004-05-10 20:22 ` Andrew Cagney
2004-05-10 20:48 ` Daniel Jacobowitz
@ 2004-05-10 20:48 ` Daniel Jacobowitz
1 sibling, 0 replies; 5+ messages in thread
From: Daniel Jacobowitz @ 2004-05-10 20:48 UTC (permalink / raw)
To: Andrew Cagney; +Cc: Maciej W. Rozycki, gdb-patches
On Mon, May 10, 2004 at 04:22:56PM -0400, Andrew Cagney wrote:
> >On Tue, Apr 20, 2004 at 05:00:21PM +0200, Maciej W. Rozycki wrote:
> >
> >>>Hello,
> >>>
> >>> Despite:
> >>>
> >>> http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
> >>>
> >>>the following patch hasn't been applied. What's wrong with it?
> >>>
> >>>2004-04-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
> >>>
> >>> * callback.c: Include cconfig.h instead of config.h.
> >>> * run.c: Likewise.
> >>> * sim-basics.h: Likewise.
> >>> * sim-load.c: Likewise.
> >>> * syscall.c: Likewise.
> >
> >
> >Nothing, it just got forgotten. I've checked in this.
>
> Did the cross targets build? I can't build powerpc as either a native
> or cross.
>
> /home/cygnus/cagney/GDB/src/sim/common/callback.c:26:21: cconfig.h: No
> such file or directory
> In file included from /home/cygnus/cagney/GDB/src/sim/common/sim-fpu.c:47:
> /home/cygnus/cagney/GDB/src/sim/common/sim-basics.h:32:21: cconfig.h: No
> such file or directory
My goof. I built a simulator to verify, but it turns out that I picked
a simulator which didn't use sim/common/! I think the include path
needs to be fixed; I'll look at it now.
--
Daniel Jacobowitz
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 6.1: Use cconfig.h instead of config.h in sim/common [resend]
2004-05-10 20:22 ` Andrew Cagney
@ 2004-05-10 20:48 ` Daniel Jacobowitz
2004-05-10 20:48 ` Daniel Jacobowitz
1 sibling, 0 replies; 5+ messages in thread
From: Daniel Jacobowitz @ 2004-05-10 20:48 UTC (permalink / raw)
To: Andrew Cagney; +Cc: Maciej W. Rozycki, gdb-patches
On Mon, May 10, 2004 at 04:22:56PM -0400, Andrew Cagney wrote:
> >On Tue, Apr 20, 2004 at 05:00:21PM +0200, Maciej W. Rozycki wrote:
> >
> >>>Hello,
> >>>
> >>> Despite:
> >>>
> >>> http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
> >>>
> >>>the following patch hasn't been applied. What's wrong with it?
> >>>
> >>>2004-04-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
> >>>
> >>> * callback.c: Include cconfig.h instead of config.h.
> >>> * run.c: Likewise.
> >>> * sim-basics.h: Likewise.
> >>> * sim-load.c: Likewise.
> >>> * syscall.c: Likewise.
> >
> >
> >Nothing, it just got forgotten. I've checked in this.
>
> Did the cross targets build? I can't build powerpc as either a native
> or cross.
>
> /home/cygnus/cagney/GDB/src/sim/common/callback.c:26:21: cconfig.h: No
> such file or directory
> In file included from /home/cygnus/cagney/GDB/src/sim/common/sim-fpu.c:47:
> /home/cygnus/cagney/GDB/src/sim/common/sim-basics.h:32:21: cconfig.h: No
> such file or directory
This is specific to PPC. It uses files from sim/common/, but doesn't
use Make-common.in. I'm testing this patch.
Index: configure
===================================================================
RCS file: /cvs/src/src/sim/ppc/configure,v
retrieving revision 1.5
diff -u -p -r1.5 configure
--- configure 22 Jun 2003 16:48:10 -0000 1.5
+++ configure 10 May 2004 20:37:42 -0000
@@ -4675,7 +4675,7 @@ echo $ac_n "checking for common simulato
echo "configure:4676: checking for common simulator directory fpu implementation" >&5
if test -f "${srcdir}/../common/sim-fpu.c"; then
echo "$ac_t""yes" 1>&6
- sim_fpu_cflags="-DHAVE_COMMON_FPU -I${srcdir}/../common"
+ sim_fpu_cflags="-DHAVE_COMMON_FPU -I../common -I${srcdir}/../common"
sim_fpu="sim-fpu.o"
else
echo "$ac_t""no" 1>&6
Index: configure.in
===================================================================
RCS file: /cvs/src/src/sim/ppc/configure.in,v
retrieving revision 1.4
diff -u -p -r1.4 configure.in
--- configure.in 22 Jun 2003 16:48:12 -0000 1.4
+++ configure.in 10 May 2004 20:37:42 -0000
@@ -700,7 +700,7 @@ fi
AC_MSG_CHECKING(for common simulator directory fpu implementation)
if test -f "${srcdir}/../common/sim-fpu.c"; then
AC_MSG_RESULT(yes)
- sim_fpu_cflags="-DHAVE_COMMON_FPU -I${srcdir}/../common"
+ sim_fpu_cflags="-DHAVE_COMMON_FPU -I../common -I${srcdir}/../common"
sim_fpu="sim-fpu.o"
else
AC_MSG_RESULT(no)
--
Daniel Jacobowitz
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-05-10 20:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-04-20 15:00 6.1: Use cconfig.h instead of config.h in sim/common [resend] Maciej W. Rozycki
2004-05-10 16:48 ` Daniel Jacobowitz
2004-05-10 20:22 ` Andrew Cagney
2004-05-10 20:48 ` Daniel Jacobowitz
2004-05-10 20:48 ` Daniel Jacobowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox