From d55a7f147c87f236c73f09751dfcd3b939b389ff Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@garethrees.org>
Date: Sun, 23 Aug 2020 16:17:36 +0100
Subject: [PATCH] Fix build on macos 10.15 with clang 11.0.

We no longer need the -Wno-extended-offsetof or -Wno-invalid-offsetof
compiler options, since the nonstandard uses of offsetof() were
fixed (see job003619), so they can just be removed.
---
 mps/code/mps.xcodeproj/project.pbxproj | 3 ---
 mps/configure                          | 2 +-
 mps/configure.ac                       | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 953022165b6..520bcda0f47 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -5606,7 +5606,6 @@
 					"-Wmissing-prototypes",
 					"-Wmissing-variable-declarations",
 					"-Wnested-externs",
-					"-Wno-extended-offsetof",
 					"-Wpointer-arith",
 					"-Wshadow",
 					"-Wstrict-aliasing=2",
@@ -6055,7 +6054,6 @@
 					"-Wmissing-prototypes",
 					"-Wmissing-variable-declarations",
 					"-Wnested-externs",
-					"-Wno-extended-offsetof",
 					"-Wpointer-arith",
 					"-Wshadow",
 					"-Wstrict-aliasing=2",
@@ -6123,7 +6121,6 @@
 					"-Wmissing-prototypes",
 					"-Wmissing-variable-declarations",
 					"-Wnested-externs",
-					"-Wno-extended-offsetof",
 					"-Wpointer-arith",
 					"-Wshadow",
 					"-Wstrict-aliasing=2",
diff --git a/mps/configure b/mps/configure
index 9f9bd8df6a9..fd66cd1db47 100755
--- a/mps/configure
+++ b/mps/configure
@@ -3374,7 +3374,7 @@ CFLAGS_GC="-ansi -pedantic -Wall -Werror -Wpointer-arith \
            -Wstrict-prototypes -Wmissing-prototypes \
            -Winline -Waggregate-return -Wnested-externs \
            -Wcast-qual -Wstrict-aliasing=2 -O -g3 -pthread"
-CFLAGS_LL="$CFLAGS_GC -Wno-invalid-offsetof"
+CFLAGS_LL="$CFLAGS_GC"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
diff --git a/mps/configure.ac b/mps/configure.ac
index 42089a3821d..ff483793b43 100644
--- a/mps/configure.ac
+++ b/mps/configure.ac
@@ -36,7 +36,7 @@ CFLAGS_GC="-ansi -pedantic -Wall -Werror -Wpointer-arith \
            -Wstrict-prototypes -Wmissing-prototypes \
            -Winline -Waggregate-return -Wnested-externs \
            -Wcast-qual -Wstrict-aliasing=2 -O -g3 -pthread"
-CFLAGS_LL="$CFLAGS_GC -Wno-invalid-offsetof"
+CFLAGS_LL="$CFLAGS_GC"
 
 AC_CANONICAL_HOST
 AC_MSG_CHECKING([target platform])