From 3ba6ad0f876ad790def1eaa57397c1cf2235cfc7 Mon Sep 17 00:00:00 2001
From: Markus Metzger <mmetzger@sourceware.org>
Date: Tue, 13 Nov 2012 15:01:44 +0000
Subject: [PATCH] 	* Makefile.in: (INTERNAL_CFLAGS): Add -DGDBSERVER 
 (various make rules): Remove -DGDBSERVER

---
 gdb/gdbserver/ChangeLog   |  5 +++++
 gdb/gdbserver/Makefile.in | 28 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a36669541d..3513dad1d8 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-13 Markus Metzger <markus.t.metzger@intel.com>
+
+	* Makefile.in: (INTERNAL_CFLAGS): Add -DGDBSERVER
+	(various make rules): Remove -DGDBSERVER
+
 2012-11-09  Yao Qi  <yao@codesourcery.com>
 
 	* spu-low.c (current_ptid): Move it to ..
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 489cf35b01..fc4fd1d1c9 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -111,7 +111,7 @@ CFLAGS = @CFLAGS@
 INTERNAL_CFLAGS_BASE =  ${CFLAGS} ${GLOBAL_CFLAGS} \
 	${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
 INTERNAL_WARN_CFLAGS =  ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
-INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS)
+INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
 
 # LDFLAGS is specifically reserved for setting from the command line
 # when running make.
@@ -450,7 +450,7 @@ UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
 # Note, we only build the IPA if -fvisibility=hidden is supported in
 # the first place.
 IPAGENT_CFLAGS = $(CPPFLAGS) $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
-	-fPIC -DGDBSERVER -DIN_PROCESS_AGENT \
+	-fPIC -DIN_PROCESS_AGENT \
 	-fvisibility=hidden
 
 # In-process agent object rules
@@ -497,40 +497,40 @@ gdbreplay.o: gdbreplay.c config.h
 dll.o: dll.c $(server_h)
 
 signals.o: ../common/signals.c $(server_h) $(signals_def)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 linux-procfs.o: ../common/linux-procfs.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 linux-ptrace.o: ../common/linux-ptrace.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 common-utils.o: ../common/common-utils.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 vec.o: ../common/vec.c $(vec_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 gdb_vecs.o: ../common/gdb_vecs.c $(vec_h) $(gdb_vecs_h) $(host_defs_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 xml-utils.o: ../common/xml-utils.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 linux-osdata.o: ../common/linux-osdata.c $(server_h) $(linux_osdata_h) ../common/gdb_dirent.h
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 ptid.o: ../common/ptid.c $(ptid_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 buffer.o: ../common/buffer.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 format.o: ../common/format.c $(server_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 agent.o: ../common/agent.c $(server_h) $(agent_h)
-	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $<
 
 # We build vasprintf with -DHAVE_CONFIG_H because we want that unit to
 # include our config.h file.  Otherwise, some system headers do not get