зеркало из https://github.com/mozilla/gecko-dev.git
Bugzilla Bug 312202: checked in HP-UX IPF (Itanium) porting changes
contributed by Grace Lu of HP. Use the .so suffix for shared libraries on HP-UX IPF. Support building on HP-UX B.11.23. r=wtc. Modified Files: coreconf/HP-UX.mk nss/lib/nss/nssinit.c Added Files: coreconf/HP-UXB.11.23.mk
This commit is contained in:
Родитель
73b4572b16
Коммит
b957c8d0a7
|
@ -44,7 +44,11 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||||
DEFAULT_COMPILER = cc
|
DEFAULT_COMPILER = cc
|
||||||
|
|
||||||
CPU_ARCH = hppa
|
CPU_ARCH = hppa
|
||||||
|
ifeq ($(OS_TEST),ia64)
|
||||||
|
DLL_SUFFIX = so
|
||||||
|
else
|
||||||
DLL_SUFFIX = sl
|
DLL_SUFFIX = sl
|
||||||
|
endif
|
||||||
CC = cc
|
CC = cc
|
||||||
CCC = CC
|
CCC = CC
|
||||||
OS_CFLAGS += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
|
OS_CFLAGS += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is the Netscape security libraries.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# Netscape Communications Corporation.
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
# On HP-UX 10.30 and 11.x, the default implementation strategy is
|
||||||
|
# pthreads. Classic nspr and pthreads-user are also available.
|
||||||
|
|
||||||
|
ifeq ($(OS_RELEASE),B.11.23)
|
||||||
|
OS_CFLAGS += -DHPUX10
|
||||||
|
DEFAULT_IMPL_STRATEGY = _PTH
|
||||||
|
endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# To use the true pthread (kernel thread) library on 10.30 and
|
||||||
|
# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
|
||||||
|
# The _REENTRANT macro is deprecated.
|
||||||
|
#
|
||||||
|
|
||||||
|
ifdef USE_PTHREADS
|
||||||
|
OS_CFLAGS += -D_POSIX_C_SOURCE=199506L
|
||||||
|
endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# Config stuff for HP-UXB.11.x.
|
||||||
|
#
|
||||||
|
include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
|
|
@ -36,7 +36,7 @@
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
/* $Id: nssinit.c,v 1.68 2005/07/08 04:41:29 julien.pierre.bugs%sun.com Exp $ */
|
/* $Id: nssinit.c,v 1.69 2005/10/12 19:04:13 wtchang%redhat.com Exp $ */
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "seccomon.h"
|
#include "seccomon.h"
|
||||||
|
@ -285,7 +285,7 @@ done:
|
||||||
static const char *dllname =
|
static const char *dllname =
|
||||||
#if defined(XP_WIN32) || defined(XP_OS2)
|
#if defined(XP_WIN32) || defined(XP_OS2)
|
||||||
"nssckbi.dll";
|
"nssckbi.dll";
|
||||||
#elif defined(HPUX)
|
#elif defined(HPUX) && !defined(__ia64) /* HP-UX PA-RISC */
|
||||||
"libnssckbi.sl";
|
"libnssckbi.sl";
|
||||||
#elif defined(DARWIN)
|
#elif defined(DARWIN)
|
||||||
"libnssckbi.dylib";
|
"libnssckbi.dylib";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче