unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#43234: Patch: Fix QNX build in 28.x
@ 2020-09-05 22:05 Elad Lahav
  2020-09-06 14:24 ` Eli Zaretskii
  0 siblings, 1 reply; 12+ messages in thread
From: Elad Lahav @ 2020-09-05 22:05 UTC (permalink / raw)
  To: 43234

[-- Attachment #1: Type: text/plain, Size: 113 bytes --]

The QNX build is currently broken due to changes to
build-aux/config.sub and the default dumping option.

--Elad

[-- Attachment #2: 0001-Fix-QNX-build.patch --]
[-- Type: text/x-patch, Size: 2121 bytes --]

From 60250939099074c1e8e2b2b2115962d7f9fbffaf Mon Sep 17 00:00:00 2001
From: Elad Lahav <elahav@qnx.com>
Date: Sat, 5 Sep 2020 17:57:49 -0400
Subject: [PATCH] Fix QNX build

* Recent changes to config.sub broke the detection of QNX systems.
* The linker flag for increasing the main stack size is wrong.
  Also, the flag should be set unconditionally, now that the default dumper
  has changed.
* The __NO_EXT_QNX flag is no longer needed, and is masking the declaration
  of memset_s().
---
 build-aux/config.sub | 12 +++---------
 configure.ac         |  5 +----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/build-aux/config.sub b/build-aux/config.sub
index 0753e308458..e7b0e3566e0 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-08-17'
+timestamp='2020-09-05'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1367,13 +1367,7 @@ IFS=
 		os=psos
 		;;
 	qnx*)
-		case $cpu in
-		    x86 | i*86)
-			;;
-		    *)
-			os=nto-$os
-			;;
-		esac
+		os=qnx
 		;;
 	hiux*)
 		os=hiuxwe2
@@ -1722,7 +1716,7 @@ kernel=
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* )
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/configure.ac b/configure.ac
index 0bcff587e8a..33948fd7760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -785,10 +785,7 @@ AC_DEFUN
   *-nto-qnx* )
     opsys=qnxnto
     test -z "$CC" && CC=qcc
-    CFLAGS="$CFLAGS -D__NO_EXT_QNX"
-    if test "$with_unexec" = yes; then
-      LDFLAGS="-N2MB $LDFLAGS"
-    fi
+    LDFLAGS="-N2M $LDFLAGS"
   ;;
 
   ## Intel 386 machines where we don't care about the manufacturer.
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-03-13  2:44 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-05 22:05 bug#43234: Patch: Fix QNX build in 28.x Elad Lahav
2020-09-06 14:24 ` Eli Zaretskii
2020-09-06 17:05   ` Andreas Schwab
2020-09-06 17:10     ` Elad Lahav
2020-09-08  0:10       ` Elad Lahav
2020-09-08 14:14         ` Eli Zaretskii
2020-09-08 14:22           ` Elad Lahav
2020-09-10 22:02           ` Lars Ingebrigtsen
2021-03-12  1:07             ` Stefan Kangas
2021-03-13  1:48               ` Elad Lahav
2021-03-13  2:44                 ` Stefan Kangas
2020-09-06 17:05   ` Elad Lahav

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).