* patches/gdb-6.7:

	removed

	* patches/gdb-6.8, patches/gdb-6.8/generic/m68k-linux-nat-get_regcache_arch.patch:
	added, coldfire patch by: Carsten Schlote

	* rules/gdb.make, rules/gdbserver.make, rules/gdb.in, rules/gdbserver.in:
	cleanups, version bump to 6.8 (but now configureable)


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8188 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 31 insertions, 53 deletions

diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index e2a561b28..872a8a149 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -1,10 +1,10 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002-2008 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 #
-# See CREDITS for details about who has contributed to this project. 
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -15,96 +15,74 @@
 #
 PACKAGES-$(PTXCONF_GDBSERVER) += gdbserver
 
-GDBSERVER_DIR		= $(BUILDDIR)/$(GDB)-server
 GDBSERVER_BUILDDIR	= $(BUILDDIR)/$(GDB)-server-build
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-gdbserver_get: $(STATEDIR)/gdbserver.get
-
-gdbserver_get_deps := \
-	$(gdbserver_get_deps_default) \
-	$(STATEDIR)/gdb.get
-
-$(STATEDIR)/gdbserver.get: $(gdbserver_get_deps)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/gdbserver.get: $(STATEDIR)/gdb.get
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-gdbserver_extract: $(STATEDIR)/gdbserver.extract
-
-gdbserver_extract_deps := \
-	$(gdbserver_extract_deps_default) \
-	$(STATEDIR)/gdb.get \
-	$(STATEDIR)/gdb.extract
-
-$(STATEDIR)/gdbserver.extract: $(gdbserver_extract_deps)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/gdbserver.extract: $(STATEDIR)/gdb.extract
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-gdbserver_prepare: $(STATEDIR)/gdbserver.prepare
-
-GDBSERVER_PATH		= $(GDB_PATH)
-GDBSERVER_ENV		= $(GDB_ENV)
+GDBSERVER_PATH	:= $(GDB_PATH)
+GDBSERVER_ENV	:= $(GDB_ENV)
 
-ifndef PTXCONF_GDBSERVER_SHARED
-GDBSERVER_ENV		+=  LDFLAGS=-static
+ifndef PTXCONF_GDBSERVER__SHARED
+GDBSERVER_ENV	+=  LDFLAGS=-static
 endif
 
 #
 # autoconf
 #
-GDBSERVER_AUTOCONF	= $(GDB_AUTOCONF)
+GDBSERVER_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--target=$(PTXCONF_GNU_TARGET) \
+	--with-build-sysroot=$(SYSROOT)
 
-$(STATEDIR)/gdbserver.prepare: $(gdbserver_prepare_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/gdbserver.prepare:
+	@$(call targetinfo)
 	@$(call clean, $(GDBSERVER_BUILDDIR))
 	mkdir -p $(GDBSERVER_BUILDDIR)
-#
-# we call sh, cause configure is not executable
-#
 	cd $(GDBSERVER_BUILDDIR) && $(GDBSERVER_PATH) $(GDBSERVER_ENV) \
-		sh $(GDB_DIR)/gdb/gdbserver/configure $(GDBSERVER_AUTOCONF)
-	@$(call touch, $@)
+		$(GDB_DIR)/gdb/gdbserver/configure $(GDBSERVER_AUTOCONF)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-gdbserver_compile: $(STATEDIR)/gdbserver.compile
-
-$(STATEDIR)/gdbserver.compile: $(gdbserver_compile_deps_default)
-	@$(call targetinfo, $@)
-	$(GDBSERVER_PATH) make -C $(GDBSERVER_BUILDDIR)
-	@$(call touch, $@)
+$(STATEDIR)/gdbserver.compile:
+	@$(call targetinfo)
+	cd $(GDBSERVER_BUILDDIR) && $(GDBSERVER_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-gdbserver_install: $(STATEDIR)/gdbserver.install
-
-$(STATEDIR)/gdbserver.install: $(gdbserver_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/gdbserver.install:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-gdbserver_targetinstall: $(STATEDIR)/gdbserver.targetinstall
-
-$(STATEDIR)/gdbserver.targetinstall: $(gdbserver_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/gdbserver.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, gdbserver)
 	@$(call install_fixup, gdbserver,PACKAGE,gdbserver)
@@ -119,13 +97,13 @@ $(STATEDIR)/gdbserver.targetinstall: $(gdbserver_targetinstall_deps_default)
 
 	@$(call install_finish, gdbserver)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------
 
-gdbserver_clean: 
+gdbserver_clean:
 	rm -rf $(STATEDIR)/gdbserver.* $(GDBSERVER_BUILDDIR)
 	rm -rf $(IMAGEDIR)/gdbserver_*