gnulib: Ensure all libraries are used when building gdb/gdbserver

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

diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 9d7687be534feb943209b86c3b31f018113cb1b1..1969ed0ec377656cbccaf66fb4532366424c0482 100644 (file)
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -83,9 +83,12 @@ include $(srcdir)/../gdb/silent-rules.mk
 # GNU make is used.  The overrides implement dependency tracking.
 COMPILE.pre = $(CXX) $(CXX_DIALECT)
 COMPILE.post = -c -o $@
-COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
 POSTCOMPILE = @true
 
+# CXXFLAGS is at the very end on purpose, so that user-supplied flags can
+# override internal flags.
+COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) $(COMPILE.post)
+
 # It is also possible that you will need to add -I/usr/include/sys to the
 # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which
 # is where it should be according to Posix).
@@ -111,8 +114,7 @@ ustinc = @ustinc@
 
 # gnulib
 GNULIB_BUILDDIR = ../gnulib
-LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
+include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc
 
 # Where is the INTL library?  Typically in ../intl.
 INTL = @LIBINTL@
@@ -158,7 +160,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
 WIN32APILIBS = @WIN32APILIBS@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \
+INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
        ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS)
 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
 INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
@@ -179,6 +181,7 @@ SFILES = \
        $(srcdir)/i387-fp.cc \
        $(srcdir)/inferiors.cc \
        $(srcdir)/linux-aarch64-low.cc \
+       $(srcdir)/linux-arc-low.cc \
        $(srcdir)/linux-arm-low.cc \
        $(srcdir)/linux-ia64-low.cc \
        $(srcdir)/linux-low.cc \
@@ -193,6 +196,11 @@ SFILES = \
        $(srcdir)/linux-x86-low.cc \
        $(srcdir)/linux-xtensa-low.cc \
        $(srcdir)/mem-break.cc \
+       $(srcdir)/netbsd-aarch64-low.cc \
+       $(srcdir)/netbsd-amd64-low.cc \
+       $(srcdir)/netbsd-i386-low.cc \
+       $(srcdir)/netbsd-low.cc \
+       $(srcdir)/netbsd-low.h \
        $(srcdir)/proc-service.cc \
        $(srcdir)/proc-service.list \
        $(srcdir)/regcache.cc \
@@ -206,6 +214,7 @@ SFILES = \
        $(srcdir)/win32-low.cc \
        $(srcdir)/x86-low.cc \
        $(srcdir)/../gdb/alloc.c \
+       $(srcdir)/../gdb/arch/arc.c \
        $(srcdir)/../gdb/arch/arm.c \
        $(srcdir)/../gdb/arch/arm-get-next-pcs.c \
        $(srcdir)/../gdb/arch/arm-linux.c \
@@ -348,17 +357,19 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
                $(INTL_DEPS) $(GDBSUPPORT)
        $(SILENCE) rm -f gdbserver$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
+               $(CXXFLAGS) \
                -o gdbserver$(EXEEXT) $(OBS) $(GDBSUPPORT) $(LIBGNU) \
-               $(LIBIBERTY) $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) \
-               $(WIN32APILIBS)
+               $(LIBGNU_EXTRA_LIBS) $(LIBIBERTY) $(INTL) \
+               $(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS)
 
 gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \
                $(INTL_DEPS) $(GDBSUPPORT)
        $(SILENCE) rm -f gdbreplay$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
+               $(CXXFLAGS) \
                -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) \
-               $(GDBSUPPORT) $(LIBGNU) $(LIBIBERTY) $(INTL) \
-               $(WIN32APILIBS)
+               $(GDBSUPPORT) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) \
+               $(LIBIBERTY) $(INTL) $(WIN32APILIBS)
 
 IPA_OBJS = \
        alloc-ipa.o \
@@ -383,6 +394,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS}
        $(SILENCE) rm -f $(IPA_LIB)
        $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
                -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
+                $(CXXFLAGS) \
                -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
 
 # Put the proper machine-specific files first, so M-. on a machine
@@ -478,7 +490,9 @@ IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
        -fPIC -DIN_PROCESS_AGENT \
        -fvisibility=hidden
 
-IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
+# CXXFLAGS is at the very end on purpose, so that user-supplied flags can
+# override internal flags.
+IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(CXXFLAGS) $(COMPILE.post)
 
 # Rules for special cases.