|
|
@@ -1,8 +1,7 @@
|
|
|
Index: Makefile.in
|
|
|
-diff -Nau Makefile.in.orig Makefile.in
|
|
|
---- Makefile.in.orig 2004-09-05 21:10:28 +0200
|
|
|
-+++ Makefile.in 2004-09-08 18:57:11 +0200
|
|
|
-@@ -319,6 +319,7 @@
|
|
|
+--- Makefile.in.orig 2004-11-08 17:21:22 +0100
|
|
|
++++ Makefile.in 2004-11-10 12:26:05 +0100
|
|
|
+@@ -325,6 +325,7 @@
|
|
|
|
|
|
CC = @CC@
|
|
|
CFLAGS = @CFLAGS@
|
|
|
@@ -10,7 +9,7 @@ diff -Nau Makefile.in.orig Makefile.in
|
|
|
LIBCFLAGS = $(CFLAGS)
|
|
|
|
|
|
CXX = @CXX@
|
|
|
-@@ -382,6 +383,7 @@
|
|
|
+@@ -388,6 +389,7 @@
|
|
|
# (which we know are built with gcc) are built with optimizations so
|
|
|
# prepend -O2 when setting CFLAGS_FOR_TARGET.
|
|
|
CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
|
|
|
@@ -18,7 +17,7 @@ diff -Nau Makefile.in.orig Makefile.in
|
|
|
# If GCC_FOR_TARGET is not overriden on the command line, then this
|
|
|
# variable is passed down to the gcc Makefile, where it is used to
|
|
|
# build libgcc2.a. We define it here so that it can itself be
|
|
|
-@@ -525,10 +527,6 @@
|
|
|
+@@ -531,10 +533,6 @@
|
|
|
"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
|
|
|
"EXPECT=$(EXPECT)" \
|
|
|
"FLEX=$(FLEX)" \
|
|
|
@@ -29,7 +28,7 @@ diff -Nau Makefile.in.orig Makefile.in
|
|
|
"LEX=$(LEX)" \
|
|
|
"M4=$(M4)" \
|
|
|
"MAKE=$(MAKE)" \
|
|
|
-@@ -538,6 +536,7 @@
|
|
|
+@@ -544,6 +542,7 @@
|
|
|
"YACC=$(YACC)" \
|
|
|
"AR_FLAGS=$(AR_FLAGS)" \
|
|
|
"CFLAGS=$(CFLAGS)" \
|
|
|
@@ -37,7 +36,7 @@ diff -Nau Makefile.in.orig Makefile.in
|
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
|
"LDFLAGS=$(LDFLAGS)" \
|
|
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
|
|
-@@ -606,6 +605,7 @@
|
|
|
+@@ -612,6 +611,7 @@
|
|
|
'AS=$$(AS_FOR_TARGET)' \
|
|
|
'CC=$$(CC_FOR_TARGET)' \
|
|
|
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
|
|
|
@@ -46,10 +45,9 @@ diff -Nau Makefile.in.orig Makefile.in
|
|
|
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
|
|
|
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
|
|
|
Index: gdb/Makefile.in
|
|
|
-diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
---- gdb/Makefile.in.orig 2004-07-03 17:14:47 +0200
|
|
|
-+++ gdb/Makefile.in 2004-09-08 18:57:11 +0200
|
|
|
-@@ -329,6 +329,7 @@
|
|
|
+--- gdb/Makefile.in.orig 2004-11-04 03:18:49 +0100
|
|
|
++++ gdb/Makefile.in 2004-11-10 12:34:33 +0100
|
|
|
+@@ -336,6 +336,7 @@
|
|
|
# CFLAGS is specifically reserved for setting from the command line
|
|
|
# when running make. I.E. "make CFLAGS=-Wmissing-prototypes".
|
|
|
CFLAGS = @CFLAGS@
|
|
|
@@ -57,7 +55,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
|
|
|
# Need to pass this to testsuite for "make check". Probably should be
|
|
|
# consistent with top-level Makefile.in and gdb/testsuite/Makefile.in
|
|
|
-@@ -429,6 +430,7 @@
|
|
|
+@@ -436,6 +437,7 @@
|
|
|
"AR_FLAGS=$(AR_FLAGS)" \
|
|
|
"CC=$(CC)" \
|
|
|
"CFLAGS=$(CFLAGS)" \
|
|
|
@@ -65,7 +63,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
"CXX=$(CXX)" \
|
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
|
"DLLTOOL=$(DLLTOOL)" \
|
|
|
-@@ -488,6 +490,7 @@
|
|
|
+@@ -495,6 +497,7 @@
|
|
|
'CC=$$(CC_FOR_TARGET)' \
|
|
|
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
|
|
|
"CFLAGS=$(CFLAGS)" \
|
|
|
@@ -73,7 +71,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
'CXX=$$(CXX_FOR_TARGET)' \
|
|
|
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
|
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
|
-@@ -937,7 +940,7 @@
|
|
|
+@@ -954,7 +957,7 @@
|
|
|
# Prevent Sun make from putting in the machine type. Setting
|
|
|
# TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
|
|
|
.c.o:
|
|
|
@@ -82,7 +80,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
|
|
|
all: gdb$(EXEEXT) $(CONFIG_ALL)
|
|
|
@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
|
|
|
-@@ -1417,16 +1420,16 @@
|
|
|
+@@ -1430,16 +1433,16 @@
|
|
|
|
|
|
# Provide explicit rule/dependency - works for more makes.
|
|
|
copying.o: $(srcdir)/copying.c
|
|
|
@@ -101,8 +99,8 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
+ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(TARGET_SYSTEM_ROOT_DEFINE) \
|
|
|
-DBINDIR=\"$(bindir)\" $(srcdir)/main.c
|
|
|
|
|
|
- # FIXME: cagney/2003-08-10: "monitor.c" gets -Wformat-nonliteral
|
|
|
-@@ -1457,7 +1460,7 @@
|
|
|
+ # FIXME: cagney/2004-09-16: "gnu-v3-abi.c", with a GCC 3.4 compiler,
|
|
|
+@@ -1478,7 +1481,7 @@
|
|
|
$(srcdir)/thread-db.c
|
|
|
|
|
|
v850ice.o: $(srcdir)/v850ice.c
|
|
|
@@ -111,7 +109,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
|
|
|
$(GDBTK_CFLAGS) \
|
|
|
$(srcdir)/v850ice.c
|
|
|
-@@ -2603,31 +2606,31 @@
|
|
|
+@@ -2722,31 +2725,31 @@
|
|
|
$(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
|
|
|
$(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \
|
|
|
$(tui_h)
|
|
|
@@ -151,7 +149,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
|
|
|
#
|
|
|
# GDBTK sub-directory
|
|
|
-@@ -2697,7 +2700,7 @@
|
|
|
+@@ -2816,7 +2819,7 @@
|
|
|
$(symtab_h) $(inferior_h) $(command_h) \
|
|
|
$(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
|
|
|
$(tracepoint_h) $(top_h)
|
|
|
@@ -160,7 +158,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(ITK_CFLAGS) \
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
|
|
|
$(srcdir)/gdbtk/generic/gdbtk.c \
|
|
|
-@@ -2708,7 +2711,7 @@
|
|
|
+@@ -2827,7 +2830,7 @@
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-cmds.h \
|
|
|
$(defs_h) $(breakpoint_h) $(tracepoint_h) \
|
|
|
$(symfile_h) $(symtab_h) $(gdb_string_h)
|
|
|
@@ -169,7 +167,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
|
|
|
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-bp.c \
|
|
|
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
-@@ -2719,7 +2722,7 @@
|
|
|
+@@ -2838,7 +2841,7 @@
|
|
|
$(gdbcore_h) $(demangle_h) $(linespec_h) $(tui_file_h) $(top_h) \
|
|
|
$(annotate_h) $(block_h) $(dictionary_h) $(gdb_string_h) \
|
|
|
$(dis_asm_h) $(gdbcmd_h)
|
|
|
@@ -178,7 +176,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
|
|
|
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
|
|
|
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
-@@ -2729,7 +2732,7 @@
|
|
|
+@@ -2848,7 +2851,7 @@
|
|
|
$(symtab_h) $(inferior_h) $(command_h) \
|
|
|
$(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
|
|
|
$(tracepoint_h)
|
|
|
@@ -187,7 +185,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-hooks.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
|
|
|
-@@ -2737,13 +2740,13 @@
|
|
|
+@@ -2856,13 +2859,13 @@
|
|
|
$(defs_h) $(interps_h) $(ui_out_h) $(ui_file_h) \
|
|
|
$(cli_out_h) $(gdb_string_h) $(cli_cmds_h) $(cli_decode_h) \
|
|
|
$(srcdir)/gdbtk/generic/gdbtk.h
|
|
|
@@ -203,7 +201,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-main.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
|
|
|
-@@ -2751,7 +2754,7 @@
|
|
|
+@@ -2870,7 +2873,7 @@
|
|
|
$(srcdir)/gdbtk/generic/gdbtk.h \
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-cmds.h \
|
|
|
$(defs_h) $(frame_h) $(value_h) $(gdb_string_h)
|
|
|
@@ -212,7 +210,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
|
|
|
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-register.c \
|
|
|
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
-@@ -2761,7 +2764,7 @@
|
|
|
+@@ -2880,7 +2883,7 @@
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-wrapper.h \
|
|
|
$(defs_h) $(target_h) $(breakpoint_h) $(linespec_h) \
|
|
|
$(block_h) $(dictionary_h)
|
|
|
@@ -221,7 +219,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
|
|
|
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-stack.c \
|
|
|
-DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
|
|
|
-@@ -2769,14 +2772,14 @@
|
|
|
+@@ -2888,14 +2891,14 @@
|
|
|
gdbtk-varobj.o: $(srcdir)/gdbtk/generic/gdbtk-varobj.c \
|
|
|
$(srcdir)/gdbtk/generic/gdbtk.h \
|
|
|
$(defs_h) $(value_h) $(varobj_h) $(gdb_string_h)
|
|
|
@@ -238,7 +236,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
$(srcdir)/gdbtk/generic/gdbtk-wrapper.c
|
|
|
|
|
|
#
|
|
|
-@@ -2788,52 +2791,52 @@
|
|
|
+@@ -2907,52 +2910,52 @@
|
|
|
mi-cmd-break.o: $(srcdir)/mi/mi-cmd-break.c $(defs_h) $(mi_cmds_h) \
|
|
|
$(ui_out_h) $(mi_out_h) $(breakpoint_h) $(gdb_string_h) \
|
|
|
$(mi_getopt_h) $(gdb_events_h) $(gdb_h)
|
|
|
@@ -247,7 +245,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
mi-cmd-disas.o: $(srcdir)/mi/mi-cmd-disas.c $(defs_h) $(target_h) $(value_h) \
|
|
|
$(mi_cmds_h) $(mi_getopt_h) $(gdb_string_h) $(ui_out_h) $(disasm_h)
|
|
|
- $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-disas.c
|
|
|
-+ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-disas.c
|
|
|
++ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-disas.c
|
|
|
mi-cmd-env.o: $(srcdir)/mi/mi-cmd-env.c $(defs_h) $(inferior_h) $(value_h) \
|
|
|
$(mi_out_h) $(mi_cmds_h) $(mi_getopt_h) $(symtab_h) $(target_h) \
|
|
|
$(environ_h) $(command_h) $(ui_out_h) $(top_h) $(gdb_string_h) \
|
|
|
@@ -255,7 +253,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
- $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-env.c
|
|
|
+ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-env.c
|
|
|
mi-cmd-file.o: $(srcdir)/mi/mi-cmd-file.c $(defs_h) $(mi_cmds_h) \
|
|
|
- $(mi_getopt_h) $(ui_out_h) $(symtab_h) $(source_h)
|
|
|
+ $(mi_getopt_h) $(ui_out_h) $(symtab_h) $(source_h) $(objfiles_h)
|
|
|
- $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-file.c
|
|
|
+ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/mi/mi-cmd-file.c
|
|
|
mi-cmds.o: $(srcdir)/mi/mi-cmds.c $(defs_h) $(top_h) $(mi_cmds_h) \
|
|
|
@@ -305,7 +303,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
|
|
|
#
|
|
|
# rdi-share sub-directory
|
|
|
-@@ -2859,7 +2862,7 @@
|
|
|
+@@ -2978,7 +2981,7 @@
|
|
|
|
|
|
signals.o: $(srcdir)/signals/signals.c $(server_h) $(defs_h) $(target_h) \
|
|
|
$(gdb_string_h)
|
|
|
@@ -314,7 +312,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
|
|
|
#
|
|
|
# gdb/tui/ dependencies
|
|
|
-@@ -2872,21 +2875,21 @@
|
|
|
+@@ -2991,21 +2994,21 @@
|
|
|
$(tui_stack_h) $(tui_win_h) $(tui_winsource_h) $(tui_windata_h) \
|
|
|
$(target_h) $(frame_h) $(breakpoint_h) $(inferior_h) $(symtab_h) \
|
|
|
$(source_h) $(gdb_curses_h) $(readline_h)
|
|
|
@@ -341,7 +339,7 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
tui-hooks.o: $(srcdir)/tui/tui-hooks.c $(defs_h) $(symtab_h) $(inferior_h) \
|
|
|
$(command_h) $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \
|
|
|
$(gdbcore_h) $(event_loop_h) $(event_top_h) $(frame_h) \
|
|
|
-@@ -2958,14 +2961,14 @@
|
|
|
+@@ -3077,14 +3080,14 @@
|
|
|
|
|
|
xdr_ld.o: vx-share/xdr_ld.c $(defs_h) vx-share/vxTypes.h \
|
|
|
vx-share/vxWorks.h vx-share/xdr_ld.h
|
|
|
@@ -359,29 +357,27 @@ diff -Nau gdb/Makefile.in.orig gdb/Makefile.in
|
|
|
+ $(CC) -c $(INTERNAL_CFLAGS) $(CPPFLAGS) $(srcdir)/vx-share/xdr_rdb.c
|
|
|
|
|
|
### end of the gdb Makefile.in.
|
|
|
-Index: gdb/configure
|
|
|
-diff -Nau gdb/configure.orig gdb/configure
|
|
|
---- gdb/configure.orig 2004-07-17 13:29:05 +0200
|
|
|
-+++ gdb/configure 2004-09-08 18:57:11 +0200
|
|
|
-@@ -5575,7 +5575,7 @@
|
|
|
-
|
|
|
- fi ;;
|
|
|
- esac
|
|
|
--for ac_hdr in curses.h ncurses.h term.h
|
|
|
-+for ac_hdr in ncurses.h term.h curses.h
|
|
|
- do
|
|
|
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
|
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
|
Index: gdb/configure.in
|
|
|
-diff -Nau gdb/configure.in.orig gdb/configure.in
|
|
|
---- gdb/configure.in.orig 2004-07-17 13:29:08 +0200
|
|
|
-+++ gdb/configure.in 2004-09-08 18:57:11 +0200
|
|
|
-@@ -380,7 +380,7 @@
|
|
|
+--- gdb/configure.in.orig 2004-11-10 12:29:03 +0100
|
|
|
++++ gdb/configure.in 2004-11-10 12:30:20 +0100
|
|
|
+@@ -394,7 +394,7 @@
|
|
|
Solaris 2.[789] when using GCC. ]])
|
|
|
fi ;;
|
|
|
esac
|
|
|
--AC_CHECK_HEADERS(curses.h ncurses.h term.h)
|
|
|
-+AC_CHECK_HEADERS(ncurses.h term.h curses.h)
|
|
|
+-AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h term.h)
|
|
|
++AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h curses.h cursesX.h term.h)
|
|
|
|
|
|
# FIXME: kettenis/20030102: In most cases we include these
|
|
|
# unconditionally, so what's the point in checking these?
|
|
|
+Index: gdb/configure
|
|
|
+--- gdb/configure.orig 2004-11-10 12:28:55 +0100
|
|
|
++++ gdb/configure 2004-11-10 12:29:58 +0100
|
|
|
+@@ -5508,7 +5508,7 @@
|
|
|
+
|
|
|
+ fi ;;
|
|
|
+ esac
|
|
|
+-for ac_hdr in curses.h cursesX.h ncurses.h ncurses/ncurses.h term.h
|
|
|
++for ac_hdr in ncurses.h ncurses/ncurses.h curses.h cursesX.h term.h
|
|
|
+ do
|
|
|
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
|
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|