[PATCH 20/28] rs6000: Incorporate new builtins code into the build machinery

[Bill Schmidt via Gcc-patches]

2020-06-17  Bill Schmidt  <wschm...@linux.ibm.com>

        * config.gcc (powerpc*-*-*): Add rs6000-builtins.o to extra_objs.
        * config/rs6000/t-rs6000 (rs6000-gen-builtins.o): New target.
        (rbtree.o): Likewise.
        (rs6000-gen-builtins): Likewise.
        (rs6000-builtins.c): Likewise.
        (rs6000-builtins.o): Likewise.
        (rs6000-call.o): Add dependency on rs6000-builtins.c.
---
 gcc/config.gcc             |  3 ++-
 gcc/config/rs6000/t-rs6000 | 25 ++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 06ad813ad39..0536b86ca92 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -505,7 +505,8 @@ or1k*-*-*)
        ;;
 powerpc*-*-*)
        cpu_type=rs6000
-       extra_objs="rs6000-string.o rs6000-p8swap.o rs6000-logue.o 
rs6000-call.o"
+       extra_objs="rs6000-string.o rs6000-p8swap.o rs6000-logue.o"
+       extra_objs="${extra_objs} rs6000-call.o rs6000-builtins.o"
        extra_headers="ppc-asm.h altivec.h htmintrin.h htmxlintrin.h"
        extra_headers="${extra_headers} bmi2intrin.h bmiintrin.h"
        extra_headers="${extra_headers} xmmintrin.h mm_malloc.h emmintrin.h"
diff --git a/gcc/config/rs6000/t-rs6000 b/gcc/config/rs6000/t-rs6000
index 170a69591dd..1a86d7adace 100644
--- a/gcc/config/rs6000/t-rs6000
+++ b/gcc/config/rs6000/t-rs6000
@@ -43,7 +43,30 @@ rs6000-logue.o: $(srcdir)/config/rs6000/rs6000-logue.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-rs6000-call.o: $(srcdir)/config/rs6000/rs6000-call.c
+rs6000-gen-builtins.o: $(srcdir)/config/rs6000/rs6000-gen-builtins.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
+
+rbtree.o: $(srcdir)/config/rs6000/rbtree.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
+
+rs6000-gen-builtins: rs6000-gen-builtins.o rbtree.o
+       +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \
+           $(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS)
+
+rs6000-builtins.c: rs6000-gen-builtins \
+                  $(srcdir)/config/rs6000/rs6000-builtin-new.def \
+                  $(srcdir)/config/rs6000/rs6000-overload.def
+       ./rs6000-gen-builtins $(srcdir)/config/rs6000/rs6000-builtin-new.def \
+               $(srcdir)/config/rs6000/rs6000-overload.def rs6000-builtins.h \
+               rs6000-builtins.c rs6000-vecdefines.h
+
+rs6000-builtins.o: rs6000-builtins.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
+
+rs6000-call.o: $(srcdir)/config/rs6000/rs6000-call.c rs6000-builtins.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-- 
2.17.1