diff -Naurd old/src/gdb/gdbserver/Makefile.in new/src/gdb/gdbserver/Makefile.in
--- old/src/gdb/gdbserver/Makefile.in	2004-03-04 16:59:10.000000000 -0500
+++ new/src/gdb/gdbserver/Makefile.in	2004-04-07 15:04:06.398979032 -0500
@@ -171,12 +171,12 @@
 
 gdbserver: $(OBS) ${ADD_DEPS} ${CDEPS}
 	rm -f gdbserver
-	${CC-LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o gdbserver $(OBS) \
+	${CC-LD} $(GLOBAL_CFLAGS) $(CFLAGS) $(LDFLAGS) -o gdbserver $(OBS) \
 	  $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 gdbreplay: gdbreplay.o
 	rm -f gdbreplay
-	${CC-LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o gdbreplay gdbreplay.o \
+	${CC-LD} $(GLOBAL_CFLAGS) $(CFLAGS) $(LDFLAGS) -o gdbreplay gdbreplay.o \
 	  $(XM_CLIBS)
 
 # Put the proper machine-specific files first, so M-. on a machine
diff -Naurd old/src/tcl/unix/Makefile.in new/src/tcl/unix/Makefile.in
--- old/src/tcl/unix/Makefile.in	2003-01-21 14:40:18.000000000 -0500
+++ new/src/tcl/unix/Makefile.in	2004-04-07 15:05:09.046041896 -0500
@@ -477,7 +477,7 @@
 
 
 tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
-	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 		${CC_SEARCH_FLAGS} -o tclsh
 
 # Resetting the LIB_RUNTIME_DIR below is required so that