Fix the GNUstep build

* src/Makefile.in (NON_OBJC_CFLAGS): Add
-Wflex-array-member-not-at-end.

* src/lisp.h (flush_stack_call_func): "asm" is unavailable in
Objective C.

* src/nsfns.m (ns_make_frame_key_window): Delete unused
function.

(cherry picked from commit 533ed7b221ab40be217e951e925739360e457b50)

diff --git a/src/Makefile.in b/src/Makefile.in
index a14ae5eacb8d6d746c0f95cc4df6d8f5f306d614..cac0b4ea2801a58bc2d65736b508d27220acac65 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -423,7 +423,7 @@ endif
 
 # Flags that might be in WARN_CFLAGS but are not valid for Objective C.
 NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd \
-  -Wnested-externs -Wstrict-flex-arrays
+  -Wnested-externs -Wstrict-flex-arrays -Wflex-array-member-not-at-end
 # Ditto, but for C++.
 NON_CXX_CFLAGS = -Wmissing-prototypes -Wnested-externs -Wold-style-definition \
   -Wstrict-prototypes -Wno-override-init

diff --git a/src/lisp.h b/src/lisp.h
index 67fcb146515839f7d8718e8fa0b4ae2e872b9ee9..e1911cbb6608aebbae09d974d767219f08db2fb4 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4508,7 +4508,7 @@ flush_stack_call_func (void (*func) (void *arg), void *arg)
   /* Work around GCC sibling call optimization making
      '__builtin_unwind_init' ineffective (bug#65727).
      See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115132>.  */
-#if defined __GNUC__ && !defined __clang__
+#if defined __GNUC__ && !defined __clang__ && !defined __OBJC__
   asm ("");
 #endif
 }

diff --git a/src/nsfns.m b/src/nsfns.m
index b08d053610f5f412e4a00d8b1063ea70a11249e8..23f2337597686ff6f05f7b07c823765a7b634ecd 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -690,12 +690,6 @@ ns_change_tab_bar_height (struct frame *f, int height)
   SET_FRAME_GARBAGED (f);
 }
 
-void
-ns_make_frame_key_window (struct frame *f)
-{
-  [[FRAME_NS_VIEW (f) window] makeKeyWindow];
-}
-
 /* tabbar support */
 static void
 ns_set_tab_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)