Don't pass -m64 to libcc1 on aarch64-linux.

[deliverable/binutils-gdb.git] / gdb / gdbserver / Makefile.in

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 6c931ba9522b2275d6906af42e09667fda591195..3ce086d70f23df445b174c49c489ec8415d7614a 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2017 Free Software Foundation, Inc.
+# Copyright (C) 1989-2018 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -43,6 +43,7 @@ man9dir = $(mandir)/man9
 infodir = @infodir@
 htmldir = $(prefix)/html
 includedir = @includedir@
+CONFIG_SRC_SUBDIR = @CONFIG_SRC_SUBDIR@
 
 SHELL = @SHELL@
 EXEEXT = @EXEEXT@
@@ -260,7 +261,6 @@ OBS = \
        regcache.o \
        remote-utils.o \
        rsp-low.o \
-       selftest.o \
        server.o \
        signals.o \
        signals-state-save-restore.o \
@@ -434,6 +434,10 @@ clean:
        rm -f *-generated.c
        rm -f stamp-xml
        rm -f $(DEPDIR)/*.Po
+       for i in $(CONFIG_SRC_SUBDIR); do \
+               rm -f $$i/*.o;  \
+               rm -f $$i/$(DEPDIR)/*; \
+       done
        @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 maintainer-clean realclean distclean: clean
@@ -441,6 +445,9 @@ maintainer-clean realclean distclean: clean
        rm -rf $(GNULIB_BUILDDIR)
        rm -f Makefile config.status config.h stamp-h config.log
        rm -f Makefile
+       for i in $(CONFIG_SRC_SUBDIR); do \
+               rmdir $$i/$(DEPDIR); \
+       done
 
 subdir_do: force
        @for i in $(DODIRS); do \
@@ -530,11 +537,7 @@ ax.o: ax.c
        $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
        $(POSTCOMPILE)
 
-arch-i386.o: ../arch/i386.c
-       $(COMPILE) $<
-       $(POSTCOMPILE)
-
-arch-amd64.o: ../arch/amd64.c
+arch/%.o: ../arch/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
@@ -563,7 +566,7 @@ arch-amd64.o: ../arch/amd64.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-%-ipa.o: ../arch/%.c
+arch/%-ipa.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
@@ -577,10 +580,6 @@ arch-amd64.o: ../arch/amd64.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: ../arch/%.c
-       $(COMPILE) $<
-       $(POSTCOMPILE)
-
 %.o: ../common/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
@@ -617,12 +616,13 @@ ifeq ($(DEPMODE),depmode=gcc3)
 # into place if the compile succeeds.  We need this because gcc does
 # not atomically write the dependency output file.
 override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
-       -MF $(DEPDIR)/$(basename $(@F)).Tpo
-override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
-       $(DEPDIR)/$(basename $(@F)).Po
+       -MF $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo
+override POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo \
+       $(@D)/$(DEPDIR)/$(basename $(@F)).Po
 else
 override COMPILE.pre = source='$<' object='$@' libtool=no \
-       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
+       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) \
+       $(CXX) -x c++ $(CXX_DIALECT)
 # depcomp handles atomicity for us, so we don't need a postcompile
 # step.
 override POSTCOMPILE =