From 60250939099074c1e8e2b2b2115962d7f9fbffaf Mon Sep 17 00:00:00 2001 From: Elad Lahav 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