public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo commit in src/patchsets/gcc/4.8.5/gentoo: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch README.history
@ 2015-08-10 11:08 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2015-08-10 11:08 UTC (permalink / raw
  To: gentoo-commits

vapier      15/08/10 11:08:03

  Modified:            
                        93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
                        README.history
  Log:
  fix parallel build issue w/bconfig.h and gengtype-lex.c

Revision  Changes    Path
1.2                  src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?r1=1.1&r2=1.2

Index: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch	24 Jun 2015 13:38:51 -0000	1.1
+++ 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch	10 Aug 2015 11:08:03 -0000	1.2
@@ -12,6 +12,9 @@
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202894 138bc75d-0d04-0410-961f-82ee72b054a4
 which adds to-wrapper.o to ALL_HOST_BACKEND_OBJS
 
+note: this also includes a small change to the flex command:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57125#c9
+
 From ed89620f0e3de714864805f5d29dbab0341a1746 Mon Sep 17 00:00:00 2001
 From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
 Date: Wed, 3 Dec 2014 16:44:27 +0000
@@ -124,6 +127,19 @@
  build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h	\
    errors.h $(READ_MD_H)
  build/genmodes.o : genmodes.c $(BCONFIG_H) $(SYSTEM_H) errors.h		\
+@@ -2623,11 +2623,7 @@
+ # bconfig.h because AIX requires _LARGE_FILES to be defined before
+ # any system header is included.
+ gengtype-lex.c : gengtype-lex.l
+-	-$(FLEX) $(FLEXFLAGS) -o$@ $< && { \
+-	  echo '#include "bconfig.h"' > $@.tmp; \
+-	  cat $@ >> $@.tmp; \
+-	  mv $@.tmp $@; \
+-	}
++	$(FLEX) $(FLEXFLAGS) -o$@ $<
+ 
+ #\f
+ # Remake internationalization support.
 diff --git a/gcc/errors.c b/gcc/errors.c
 index be38b1f..a6a30fe 100644
 --- a/gcc/errors.c



1.2                  src/patchsets/gcc/4.8.5/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?r1=1.1&r2=1.2

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.history	24 Jun 2015 13:38:51 -0000	1.1
+++ README.history	10 Aug 2015 11:08:03 -0000	1.2
@@ -1,3 +1,6 @@
+1.1		10 Aug 2015
+	U 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
+
 1.0		24 Jun 2015
 	+ 09_all_default-ssp.patch
 	+ 10_all_default-fortify-source.patch





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo commit in src/patchsets/gcc/4.8.5/gentoo: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch README.history
@ 2015-08-20 12:24 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2015-08-20 12:24 UTC (permalink / raw
  To: gentoo-commits

vapier      15/08/20 12:24:51

  Modified:            
                        93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
                        README.history
  Log:
  backport generated_files fix from upstream #487398

Revision  Changes    Path
1.3                  src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?r1=1.2&r2=1.3

Index: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.8.5/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch	10 Aug 2015 11:08:03 -0000	1.2
+++ 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch	20 Aug 2015 12:24:51 -0000	1.3
@@ -237,3 +237,57 @@
  #include "errors.h"		/* for fatal */
 -- 
 2.3.4
+
+https://gcc.gnu.org/ml/gcc-patches/2013-07/msg01396.html
+
+From ea38f4be892b22b61a540a102bed374ddb381b9a Mon Sep 17 00:00:00 2001
+From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Wed, 25 Sep 2013 15:52:30 +0000
+Subject: [PATCH] move generated_files order-only dependency later
+
+There is an order-only dependency in gcc/Makefile.in that tries to
+build the generated files before compiling regular objects.  However,
+this appears too early, and so at the time it is seen by make,
+GCOV_OBJS and GCOV_DUMP_OBJS have not yet been set.
+
+This patch fixes the problem and prevents any future problems of this
+nature by moving the order-only dependency to the end of Makefile.in.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202894 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog   |  6 ++++++
+ gcc/Makefile.in | 13 +++++++------
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+2013-09-25  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in ($(ALL_HOST_OBJS)): Move order-only dependency to end
+	of file.
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 62b5eab..8f99a6c 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3899,11 +3900,6 @@ generated_files = config.h tm.h $(TM_P_H) $(TM_H) multilib.h \
+        common/common-target-hooks-def.h pass-instances.def \
+        c-family/c-target-hooks-def.h
+ 
+-# In order for parallel make to really start compiling the expensive
+-# objects from $(OBJS) as early as possible, build all their
+-# prerequisites strictly before all objects.
+-$(ALL_HOST_OBJS) : | $(generated_files)
+-
+ #\f
+ # How to compile object files to run on the build machine.
+ 
+@@ -5390,3 +5386,8 @@ po/gcc.pot: force
+ 	$(MAKE) srcextra
+ 	AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \
+ 		$(XGETTEXT) gcc $(srcdir)
++
++# In order for parallel make to really start compiling the expensive
++# objects from $(OBJS) as early as possible, build all their
++# prerequisites strictly before all objects.
++$(ALL_HOST_OBJS) : | $(generated_files)
+-- 
+2.4.4



1.3                  src/patchsets/gcc/4.8.5/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history?r1=1.2&r2=1.3

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.8.5/gentoo/README.history,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.history	10 Aug 2015 11:08:03 -0000	1.2
+++ README.history	20 Aug 2015 12:24:51 -0000	1.3
@@ -1,3 +1,6 @@
+1.2		20 Aug 2015
+	U 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
+
 1.1		10 Aug 2015
 	U 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-08-20 12:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-10 11:08 [gentoo-commits] gentoo commit in src/patchsets/gcc/4.8.5/gentoo: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch README.history Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2015-08-20 12:24 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox