Patchwork [1/1] gcc-4.9.inc: fix parallel building failure

login
register
mail settings
Submitter Hongxu Jia
Date July 24, 2014, 1:48 a.m.
Message ID <f6dbefbc03b1950941f7210754b03d1ab340c8f6.1406166277.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/76519/
State Accepted
Commit f6507d311ae46a61b930939528149ba58a6b6a9d
Headers show

Comments

Hongxu Jia - July 24, 2014, 1:48 a.m.
In subdir 'gcc', Most C source files included config.h which was
generated by a rule. But no related prerequisites was added to
the C source compiling rule. There was potential building failure
while makefile enabled parallel.

The C source compiling rule used suffix rule '.c.o', but the suffix
rule doesn't support prerequisites.
https://www.gnu.org/software/make/manual/html_node/Suffix-Rules.html

We used the pattern rule '%.o : %.c' to instead, and add the config.h
as its prerequisite

We also moved the '%.o : %.c' rule down to the 'build/%.o :' rule, which
makes '%.o : %.c' rule doesn't override 'build/%.o :'.

[YOCTO #6568]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 +
 ...Makefile.in-fix-parallel-building-failure.patch | 56 ++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
Khem Raj - July 24, 2014, 2:19 a.m.
On Wed, Jul 23, 2014 at 6:48 PM, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> In subdir 'gcc', Most C source files included config.h which was
> generated by a rule. But no related prerequisites was added to
> the C source compiling rule. There was potential building failure
> while makefile enabled parallel.
>
> The C source compiling rule used suffix rule '.c.o', but the suffix
> rule doesn't support prerequisites.
> https://www.gnu.org/software/make/manual/html_node/Suffix-Rules.html
>
> We used the pattern rule '%.o : %.c' to instead, and add the config.h
> as its prerequisite
>
> We also moved the '%.o : %.c' rule down to the 'build/%.o :' rule, which
> makes '%.o : %.c' rule doesn't override 'build/%.o :'.
>
> [YOCTO #6568]

Please post this patch to gcc mailing list as well for feedback.

>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 +
>  ...Makefile.in-fix-parallel-building-failure.patch | 56 ++++++++++++++++++++++
>  2 files changed, 57 insertions(+)
>  create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
> index cbf1355..10bd5d5 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.9.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
> @@ -67,6 +67,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
>             file://0051-eabispe.patch \
>             file://0052-Fix-GCC-targeting-E500-SPE-errors-with-the-_Decimal64-type.patch \
>             file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \
> +           file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \
>           "
>  SRC_URI[md5sum] = "9709b49ae0e904cbb0a6a1b62853b556"
>  SRC_URI[sha256sum] = "b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257"
> diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch b/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
> new file mode 100644
> index 0000000..213820a
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
> @@ -0,0 +1,56 @@
> +gcc/Makefile.in: fix parallel building failure
> +
> +Most C source files included config.h which was generated by a rule.
> +But no related prerequisites was added to the C source compiling rule.
> +There was potential building failure while makefile enabled parallel.
> +
> +The C source compiling rule used suffix rule '.c.o', but the suffix
> +rule doesn't support prerequisites.
> +https://www.gnu.org/software/make/manual/html_node/Suffix-Rules.html
> +
> +We used the pattern rule '%.o : %.c' to instead, and add the config.h
> +as its prerequisite
> +
> +We also moved the '%.o : %.c' rule down to the 'build/%.o :' rule, which
> +makes '%.o : %.c' rule doesn't override 'build/%.o :'.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + gcc/Makefile.in | 12 ++++++++----
> + 1 file changed, 8 insertions(+), 4 deletions(-)
> +
> +diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> +index 6475cba..04889fe 100644
> +--- a/gcc/Makefile.in
> ++++ b/gcc/Makefile.in
> +@@ -1054,10 +1054,6 @@ COMPILE = source='$<' object='$@' libtool=no \
> + POSTCOMPILE =
> + endif
> +
> +-.cc.o .c.o:
> +-      $(COMPILE) $<
> +-      $(POSTCOMPILE)
> +-
> + #
> + # Support for additional languages (other than C).
> + # C can be supported this way too (leave for later).
> +@@ -2342,6 +2338,14 @@ build/%.o :  # dependencies provided by explicit rule later
> +       $(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
> +               -o $@ $<
> +
> ++%.o: %.c $(CONFIG_H)
> ++      $(COMPILE) $<
> ++      $(POSTCOMPILE)
> ++
> ++%.o: %.cc $(CONFIG_H)
> ++      $(COMPILE) $<
> ++      $(POSTCOMPILE)
> ++
> + ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
> + ## several C macro definitions, just like version.o
> + build/version.o:  version.c version.h \
> +--
> +1.8.1.2
> +
> --
> 1.8.1.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index cbf1355..10bd5d5 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -67,6 +67,7 @@  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
            file://0051-eabispe.patch \
            file://0052-Fix-GCC-targeting-E500-SPE-errors-with-the-_Decimal64-type.patch \
            file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \
+           file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \
 	  "
 SRC_URI[md5sum] = "9709b49ae0e904cbb0a6a1b62853b556"
 SRC_URI[sha256sum] = "b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257"
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch b/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
new file mode 100644
index 0000000..213820a
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
@@ -0,0 +1,56 @@ 
+gcc/Makefile.in: fix parallel building failure
+
+Most C source files included config.h which was generated by a rule.
+But no related prerequisites was added to the C source compiling rule.
+There was potential building failure while makefile enabled parallel.
+
+The C source compiling rule used suffix rule '.c.o', but the suffix
+rule doesn't support prerequisites.
+https://www.gnu.org/software/make/manual/html_node/Suffix-Rules.html
+
+We used the pattern rule '%.o : %.c' to instead, and add the config.h
+as its prerequisite
+
+We also moved the '%.o : %.c' rule down to the 'build/%.o :' rule, which
+makes '%.o : %.c' rule doesn't override 'build/%.o :'.
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ gcc/Makefile.in | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 6475cba..04889fe 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -1054,10 +1054,6 @@ COMPILE = source='$<' object='$@' libtool=no \
+ POSTCOMPILE =
+ endif
+ 
+-.cc.o .c.o:
+-	$(COMPILE) $<
+-	$(POSTCOMPILE)
+-
+ #
+ # Support for additional languages (other than C).
+ # C can be supported this way too (leave for later).
+@@ -2342,6 +2338,14 @@ build/%.o :  # dependencies provided by explicit rule later
+ 	$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
+ 		-o $@ $<
+ 
++%.o: %.c $(CONFIG_H)
++	$(COMPILE) $<
++	$(POSTCOMPILE)
++
++%.o: %.cc $(CONFIG_H)
++	$(COMPILE) $<
++	$(POSTCOMPILE)
++
+ ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
+ ## several C macro definitions, just like version.o
+ build/version.o:  version.c version.h \
+-- 
+1.8.1.2
+