Bugzilla bug #44133: checked in NTO patches contributed by NSPRPUB_CLIENT_BRANCH
authorwtc%netscape.com
Thu, 29 Jun 2000 00:24:19 +0000
branchNSPRPUB_CLIENT_BRANCH
changeset 1452 ace9608c51b5a9642990331e05784e6097f0ad76
parent 1451 615e0e572e1f9061d5bb4c83b64f471bd11400b2
child 1456 67aef14705b563928e0aa94764b41b5e8f643d64
push idunknown
push userunknown
push dateunknown
bugs44133
Bugzilla bug #44133: checked in NTO patches contributed by Jerry Kirk <Jerry.Kirk@nexwarecorp.com>. Modified files: NTO.mk, arch.mk (NSPRPUB_CLIENT_BRANCH. a=brendan@mozilla.org.)
config/NTO.mk
config/arch.mk
--- a/config/NTO.mk
+++ b/config/NTO.mk
@@ -50,25 +50,25 @@ LD			 = $(CC)
 CCC			 = $(CC)
 
 # Old Flags  -DNO_REGEX   -DSTRINGS_ALIGNED
 
 OS_CFLAGS	 = -Wc,-Wall -Wc,-Wno-parentheses -DNTO  \
 			   -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared
 
 COMPILER_TAG = _qcc
-MKSHLIB		 = qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -g2 -M
+MKSHLIB		 = qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -M
 
 RANLIB		 = ranlib
 G++INCLUDES	 =
 OS_LIBS		 =
 EXTRA_LIBS  = -lsocket
 
 ifdef BUILD_OPT
-OPTIMIZER = -O2
+OPTIMIZER = -O1
 else
-OPTIMIZER = -O2 -gdwarf-2
+OPTIMIZER = -O1 -gstabs
 endif
 
 NOSUCHFILE	= /no-such-file
 
 GARBAGE		+= *.map
 
--- a/config/arch.mk
+++ b/config/arch.mk
@@ -55,30 +55,31 @@ OS_ARCH		:= Rhapsody
 endif
 ifeq ($(OS_ARCH),ncr)
 OS_ARCH		:= NCR
 endif
 # This is the only way to correctly determine the actual OS version on NCR boxes.
 ifeq ($(OS_ARCH),NCR)
 OS_RELEASE	:= $(shell awk '{print $$3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$$/\2.\3/')
 endif
-ifeq ($(OS_ARCH),procnto)
-OS_ARCH      := NTO
-OS_RELEASE := _$(OS_TEST)$(OS_RELEASE)
-endif
 ifeq ($(OS_ARCH),UNIX_System_V)
 OS_ARCH		:= NEC
 endif
 ifneq (,$(findstring POSIX_for_OpenVMS,$(OS_ARCH)))
 OS_ARCH		:= OpenVMS
 CPU_ARCH	:= $(shell uname -Wh)
 OS_RELEASE	:= $(shell uname -v)
 endif
 ifeq ($(OS_ARCH),QNX)
-OS_RELEASE	:= $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/')
+	ifeq ($(OS_RELEASE),6.00)
+		OS_ARCH := NTO
+		OS_RELEASE := _$(OS_TEST)$(OS_RELEASE)
+	else
+		OS_RELEASE := $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/')
+	endif
 endif
 ifeq ($(OS_ARCH),SCO_SV)
 OS_ARCH		:= SCOOS
 OS_RELEASE	:= 5.0
 endif
 ifeq ($(OS_ARCH),SINIX-N)
 OS_ARCH		:= SINIX
 endif