[PATCH] Remove .PHONY targets when building .fda files during autoprofiledbootstrap

[PATCH] Remove .PHONY targets when building .fda files during autoprofiledbootstrap

[Eugene Rozenfeld]

These .PHONY targets are always executed and were breaking `make install`
for autoprofiledbootstrap build.

gcc/ChangeLog:

        * c/Make-lang.in: Make create_fdas_for_cc1 target not .PHONY
        * cp/Make-lang.in: Make create_fdas_for_cc1plus target not .PHONY
        * lto/Make-lang.in: Make create_fdas_for_lto1 target not .PHONY

Tested on x86_64-pc-linux-gnu.

---
 gcc/c/Make-lang.in   | 4 ++--
 gcc/cp/Make-lang.in  | 4 ++--
 gcc/lto/Make-lang.in | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in
index 79bc0dfd1cf..3ef8a674971 100644
--- a/gcc/c/Make-lang.in
+++ b/gcc/c/Make-lang.in
@@ -91,8 +91,6 @@ cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS)
 components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"

-.PHONY: create_fdas_for_cc1
-
 cc1.fda: create_fdas_for_cc1
        $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda -gcov_version 2

@@ -116,6 +114,8 @@ create_fdas_for_cc1: ../stage1-gcc/cc1$(exeext) ../prev-gcc/$(PERF_DATA)
            $(CREATE_GCOV) -binary ../prev-gcc/cc1$(exeext) -gcov $$profile_name -profile $$perf_path -gcov_version 2; \          fi; \
        done;
+
+       $(STAMP) $@
 #
 # Build hooks:

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index ba5e8766e99..2727fb7f8cc 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -189,8 +189,6 @@ cp/name-lookup.o: $(srcdir)/cp/std-name-hint.h
 components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"

-.PHONY: create_fdas_for_cc1plus
-
 cc1plus.fda: create_fdas_for_cc1plus
        $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda -gcov_version 2

@@ -214,6 +212,8 @@ create_fdas_for_cc1plus: ../stage1-gcc/cc1plus$(exeext) ../prev-gcc/$(PERF_DATA)
            $(CREATE_GCOV) -binary ../prev-gcc/cc1plus$(exeext) -gcov $$profile_name -profile $$perf_path -gcov_version 2; \
          fi; \
        done;
+
+       $(STAMP) $@
 #
 # Build hooks:

diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 98aa9f4cc39..7dc0a9fef42 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -108,8 +108,6 @@ lto/lto-dump.o: $(LTO_OBJS)
 components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"

-.PHONY: create_fdas_for_lto1
-
 lto1.fda: create_fdas_for_lto1
        $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda -gcov_version 2

@@ -134,6 +132,8 @@ create_fdas_for_lto1: ../stage1-gcc/lto1$(exeext) ../prev-gcc/$(PERF_DATA)
          fi; \
        done;

+       $(STAMP) $@
+
 # LTO testing is done as part of C/C++/Fortran etc. testing.
 check-lto:

--
2.25.1

Re: [PATCH] Remove .PHONY targets when building .fda files during autoprofiledbootstrap

[Richard Biener]

On Tue, Sep 19, 2023 at 8:17 PM Eugene Rozenfeld
<Eugene.Rozenfeld@microsoft.com> wrote:
>
> These .PHONY targets are always executed and were breaking `make install`
> for autoprofiledbootstrap build.

OK.

> gcc/ChangeLog:
>
>         * c/Make-lang.in: Make create_fdas_for_cc1 target not .PHONY
>         * cp/Make-lang.in: Make create_fdas_for_cc1plus target not .PHONY
>         * lto/Make-lang.in: Make create_fdas_for_lto1 target not .PHONY
>
> Tested on x86_64-pc-linux-gnu.
>
> ---
>  gcc/c/Make-lang.in   | 4 ++--
>  gcc/cp/Make-lang.in  | 4 ++--
>  gcc/lto/Make-lang.in | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in
> index 79bc0dfd1cf..3ef8a674971 100644
> --- a/gcc/c/Make-lang.in
> +++ b/gcc/c/Make-lang.in
> @@ -91,8 +91,6 @@ cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS)
>  components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
>  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
>
> -.PHONY: create_fdas_for_cc1
> -
>  cc1.fda: create_fdas_for_cc1
>         $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda -gcov_version 2
>
> @@ -116,6 +114,8 @@ create_fdas_for_cc1: ../stage1-gcc/cc1$(exeext) ../prev-gcc/$(PERF_DATA)
>             $(CREATE_GCOV) -binary ../prev-gcc/cc1$(exeext) -gcov $$profile_name -profile $$perf_path -gcov_version 2; \          fi; \
>         done;
> +
> +       $(STAMP) $@
>  #
>  # Build hooks:
>
> diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
> index ba5e8766e99..2727fb7f8cc 100644
> --- a/gcc/cp/Make-lang.in
> +++ b/gcc/cp/Make-lang.in
> @@ -189,8 +189,6 @@ cp/name-lookup.o: $(srcdir)/cp/std-name-hint.h
>  components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
>  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
>
> -.PHONY: create_fdas_for_cc1plus
> -
>  cc1plus.fda: create_fdas_for_cc1plus
>         $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda -gcov_version 2
>
> @@ -214,6 +212,8 @@ create_fdas_for_cc1plus: ../stage1-gcc/cc1plus$(exeext) ../prev-gcc/$(PERF_DATA)
>             $(CREATE_GCOV) -binary ../prev-gcc/cc1plus$(exeext) -gcov $$profile_name -profile $$perf_path -gcov_version 2; \
>           fi; \
>         done;
> +
> +       $(STAMP) $@
>  #
>  # Build hooks:
>
> diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
> index 98aa9f4cc39..7dc0a9fef42 100644
> --- a/gcc/lto/Make-lang.in
> +++ b/gcc/lto/Make-lang.in
> @@ -108,8 +108,6 @@ lto/lto-dump.o: $(LTO_OBJS)
>  components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe"
>  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
>
> -.PHONY: create_fdas_for_lto1
> -
>  lto1.fda: create_fdas_for_lto1
>         $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda -gcov_version 2
>
> @@ -134,6 +132,8 @@ create_fdas_for_lto1: ../stage1-gcc/lto1$(exeext) ../prev-gcc/$(PERF_DATA)
>           fi; \
>         done;
>
> +       $(STAMP) $@
> +
>  # LTO testing is done as part of C/C++/Fortran etc. testing.
>  check-lto:
>
> --
> 2.25.1