[2/2] gcc_qsort: build system changes

Message ID 20180510155641.2950-3-amonakov@ispras.ru
State New
Headers show
Series
  • Introduce gcc_qsort
Related show

Commit Message

Alexander Monakov May 10, 2018, 3:56 p.m.
* Makefile.in (OBJS-libcommon): Add sort.o.
        (build/sort.o): New target.  Use it...
        (BUILD_RTL): ... here, and...
        (build/gencfn-macros): ... here, and...
        (build/genmatch): ... here.

---
 gcc/Makefile.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Richard Biener May 11, 2018, 9:06 a.m. | #1
On Thu, May 10, 2018 at 5:56 PM, Alexander Monakov <amonakov@ispras.ru> wrote:
>         * Makefile.in (OBJS-libcommon): Add sort.o.
>         (build/sort.o): New target.  Use it...
>         (BUILD_RTL): ... here, and...
>         (build/gencfn-macros): ... here, and...
>         (build/genmatch): ... here.

OK if the rest is approved.

Richard.

> ---
>  gcc/Makefile.in | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> index 20bee0494b1..8ec0511704d 100644
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -1076,7 +1076,7 @@ BUILD_LIBS = $(BUILD_LIBIBERTY)
>
>  BUILD_RTL = build/rtl.o build/read-rtl.o build/ggc-none.o \
>             build/vec.o build/min-insn-modes.o build/gensupport.o \
> -           build/print-rtl.o build/hash-table.o
> +           build/print-rtl.o build/hash-table.o build/sort.o
>  BUILD_MD = build/read-md.o
>  BUILD_ERRORS = build/errors.o
>
> @@ -1611,7 +1611,7 @@ OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
>         pretty-print.o intl.o \
>         sbitmap.o \
>         vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
> -       selftest.o selftest-diagnostic.o
> +       selftest.o selftest-diagnostic.o sort.o
>
>  # Objects in libcommon-target.a, used by drivers and by the core
>  # compiler and containing target-dependent code.
> @@ -2681,6 +2681,7 @@ build/vec.o : vec.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) $(VEC_H)      \
>    $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
>  build/hash-table.o : hash-table.c $(BCONFIG_H) $(SYSTEM_H)             \
>    $(CORETYPES_H) $(HASH_TABLE_H) $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
> +build/sort.o : sort.cc $(BCONFIG_H) $(SYSTEM_H)
>  build/inchash.o : inchash.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H)    \
>    $(HASHTAB_H) inchash.h
>  build/gencondmd.o : build/gencondmd.c $(BCONFIG_H) $(SYSTEM_H)         \
> @@ -2817,7 +2818,7 @@ build/genautomata$(build_exeext) : BUILD_LIBS += -lm
>
>  build/genrecog$(build_exeext) : build/hash-table.o build/inchash.o
>  build/gencfn-macros$(build_exeext) : build/hash-table.o build/vec.o \
> -  build/ggc-none.o
> +  build/ggc-none.o build/sort.o
>
>  # For stage1 and when cross-compiling use the build libcpp which is
>  # built with NLS disabled.  For stage2+ use the host library and
> @@ -2831,7 +2832,7 @@ build/genmatch$(build_exeext): BUILD_LIBS += $(LIBINTL) $(LIBICONV)
>  endif
>
>  build/genmatch$(build_exeext) : $(BUILD_CPPLIB) \
> -  $(BUILD_ERRORS) build/vec.o build/hash-table.o
> +  $(BUILD_ERRORS) build/vec.o build/hash-table.o build/sort.o
>
>  # These programs are not linked with the MD reader.
>  build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \
> --
> 2.13.3
>

Patch

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 20bee0494b1..8ec0511704d 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1076,7 +1076,7 @@  BUILD_LIBS = $(BUILD_LIBIBERTY)
 
 BUILD_RTL = build/rtl.o build/read-rtl.o build/ggc-none.o \
 	    build/vec.o build/min-insn-modes.o build/gensupport.o \
-	    build/print-rtl.o build/hash-table.o
+	    build/print-rtl.o build/hash-table.o build/sort.o
 BUILD_MD = build/read-md.o
 BUILD_ERRORS = build/errors.o
 
@@ -1611,7 +1611,7 @@  OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
 	pretty-print.o intl.o \
 	sbitmap.o \
 	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
-	selftest.o selftest-diagnostic.o
+	selftest.o selftest-diagnostic.o sort.o
 
 # Objects in libcommon-target.a, used by drivers and by the core
 # compiler and containing target-dependent code.
@@ -2681,6 +2681,7 @@  build/vec.o : vec.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) $(VEC_H)	\
   $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
 build/hash-table.o : hash-table.c $(BCONFIG_H) $(SYSTEM_H)		\
   $(CORETYPES_H) $(HASH_TABLE_H) $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
+build/sort.o : sort.cc $(BCONFIG_H) $(SYSTEM_H)
 build/inchash.o : inchash.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H)	\
   $(HASHTAB_H) inchash.h
 build/gencondmd.o : build/gencondmd.c $(BCONFIG_H) $(SYSTEM_H)		\
@@ -2817,7 +2818,7 @@  build/genautomata$(build_exeext) : BUILD_LIBS += -lm
 
 build/genrecog$(build_exeext) : build/hash-table.o build/inchash.o
 build/gencfn-macros$(build_exeext) : build/hash-table.o build/vec.o \
-  build/ggc-none.o
+  build/ggc-none.o build/sort.o
 
 # For stage1 and when cross-compiling use the build libcpp which is
 # built with NLS disabled.  For stage2+ use the host library and
@@ -2831,7 +2832,7 @@  build/genmatch$(build_exeext): BUILD_LIBS += $(LIBINTL) $(LIBICONV)
 endif
 
 build/genmatch$(build_exeext) : $(BUILD_CPPLIB) \
-  $(BUILD_ERRORS) build/vec.o build/hash-table.o
+  $(BUILD_ERRORS) build/vec.o build/hash-table.o build/sort.o
 
 # These programs are not linked with the MD reader.
 build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \