diff --git a/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset b/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset
index d8ef70758..14f568a4d 100644
--- a/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset
+++ b/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset
@@ -1,11 +1,11 @@
-From 829c9878f057c1b1687d443a25e9ffa363162156 Mon Sep 17 00:00:00 2001
+From a877e2ecbca87e9cdf28f28fc884bc8a88d93d08 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 28 Mar 2018 16:51:49 +0000
 Subject: Drop gcc options unknown to gcc2.
 
 
 diff --git a/lib/Makefile b/lib/Makefile
-index 9711f75..5762ab9 100644
+index 386583e..a30c956 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -23,10 +23,9 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
@@ -17,11 +17,11 @@ index 9711f75..5762ab9 100644
 +DEBUGFLAGS= -Wall         -Wcast-qual -Wcast-align -Wshadow \
              -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \
 -            -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
-+                  -Wformat=2                           -Wwrite-strings \
-             -Wredundant-decls -Wmissing-prototypes
++            -Wvla -Wformat=2                           -Wwrite-strings \
+             -Wredundant-decls -Wmissing-prototypes -Wc++-compat
  CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
  FLAGS    = $(CPPFLAGS) $(CFLAGS)
-@@ -122,7 +121,7 @@ $(LIBZSTD): $(ZSTD_FILES)
+@@ -157,7 +156,7 @@ $(LIBZSTD): $(ZSTD_FILES)
  else
  
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
@@ -31,10 +31,10 @@ index 9711f75..5762ab9 100644
  	@echo compiling dynamic library $(LIBVER)
  	@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 diff --git a/programs/Makefile b/programs/Makefile
-index 32dbc67..69089dc 100644
+index d1910fb..0a70b38 100644
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -44,10 +44,9 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
+@@ -49,10 +49,9 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
  CPPFLAGS   += -D__USE_MINGW_ANSI_STDIO   # compatibility with %zu formatting
  endif
  CFLAGS  ?= -O3
@@ -44,29 +44,29 @@ index 32dbc67..69089dc 100644
              -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \
 -            -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
 +                  -Wformat=2                           -Wwrite-strings \
-             -Wredundant-decls -Wmissing-prototypes
+             -Wredundant-decls -Wmissing-prototypes -Wc++-compat
  CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
  FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 -- 
-2.16.3
+2.19.1
 
 
-From 02dfa8b0cfcb5cfc363745a018cf7f155dd6cbb7 Mon Sep 17 00:00:00 2001
+From 9f9453b5e5f676a0bab5684e593d822b15a3e87b Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Mon, 29 Oct 2018 19:39:46 +0000
 Subject: Remove "-Werror" from MOREFLAGS to fix "make test" with gcc2.
 
 
 diff --git a/Makefile b/Makefile
-index c63db80..a4c03d1 100644
+index ed78d19..9aa89a6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -64,7 +64,7 @@ zlibwrapper: lib
- 
+@@ -65,7 +65,7 @@ zlibwrapper: lib
  ## test: run long-duration tests
  .PHONY: test
--test: MOREFLAGS += -g -DDEBUGLEVEL=1 -Werror
-+test: MOREFLAGS += -g -DDEBUGLEVEL=1
+ DEBUGLEVEL ?= 1
+-test: MOREFLAGS += -g -DDEBUGLEVEL=$(DEBUGLEVEL) -Werror
++test: MOREFLAGS += -g -DDEBUGLEVEL=$(DEBUGLEVEL)
  test:
  	MOREFLAGS="$(MOREFLAGS)" $(MAKE) -j -C $(PRGDIR) allVariants
  	$(MAKE) -C $(TESTDIR) $@
@@ -74,14 +74,14 @@ index c63db80..a4c03d1 100644
 2.19.1
 
 
-From 542f558e6ed9ced51e8c2c82d5b3a989aaa0c504 Mon Sep 17 00:00:00 2001
+From 43d9e0026339fdba22637a8507f12d3ffafd67d3 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Tue, 30 Oct 2018 11:07:16 +0000
 Subject: Drop gcc options unknown to gcc2 in tests/Makefile.
 
 
 diff --git a/tests/Makefile b/tests/Makefile
-index 2a96829..e9ead89 100644
+index 25bd5c8..d08c48a 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -31,10 +31,9 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed