Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/80b51e851716e92eee32e7750ad0f05dba60b2c1
...commit
http://git.netsurf-browser.org/toolchains.git/commit/80b51e851716e92eee32e7750ad0f05dba60b2c1
...tree
http://git.netsurf-browser.org/toolchains.git/tree/80b51e851716e92eee32e7750ad0f05dba60b2c1
The branch, master has been updated
via 80b51e851716e92eee32e7750ad0f05dba60b2c1 (commit)
from c743a1968ffec8ca2b22f7cb5595cc36e1f3e018 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=80b51e851716e92eee32e7750ad0f05dba60b2c1
commit 80b51e851716e92eee32e7750ad0f05dba60b2c1
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
apply part of upstream fix for inline redefinition
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=ec1cc0263f156f70693a62cf17b254a0029f4852
diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile
index 4a5a7e7..e3b6cfb 100644
--- a/i686-w64-mingw32/Makefile
+++ b/i686-w64-mingw32/Makefile
@@ -104,6 +104,7 @@ $(BUILDSTEPS)/mingw-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL)
###
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
+ for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d
$(GCC_SRCDIR)/gcc -p0 <$$p ; done
touch $@
$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d
$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
diff --git a/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
new file mode 100644
index 0000000..f0598e5
--- /dev/null
+++ b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.gperf.orig 2017-09-15 16:17:49.249145794 +0100
++++ gcc/cp/cfns.gperf 2017-09-15 16:18:26.468005263 +0100
+@@ -16,14 +16,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ %}
+ %%
+ # The standard C library functions, for feeding to gperf; the result is used
-----------------------------------------------------------------------
Summary of changes:
i686-w64-mingw32/Makefile | 1 +
i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile
index 4a5a7e7..e3b6cfb 100644
--- a/i686-w64-mingw32/Makefile
+++ b/i686-w64-mingw32/Makefile
@@ -104,6 +104,7 @@ $(BUILDSTEPS)/mingw-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL)
###
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
+ for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d
$(GCC_SRCDIR)/gcc -p0 <$$p ; done
touch $@
$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d
$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
diff --git a/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
new file mode 100644
index 0000000..f0598e5
--- /dev/null
+++ b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.gperf.orig 2017-09-15 16:17:49.249145794 +0100
++++ gcc/cp/cfns.gperf 2017-09-15 16:18:26.468005263 +0100
+@@ -16,14 +16,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ %}
+ %%
+ # The standard C library functions, for feeding to gperf; the result is used
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
