summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulien.pierre.bugs%sun.com <devnull@localhost>2005-11-04 04:11:04 +0000
committerjulien.pierre.bugs%sun.com <devnull@localhost>2005-11-04 04:11:04 +0000
commit3a8895e1d98b7b93304f9fe2cf97667ece82c310 (patch)
treeeccd2961e1f896a6df0244bbf9942a363023da4c
parent39feffc841475fd243e080bbe338a229ecc88dac (diff)
downloadnss-hg-3a8895e1d98b7b93304f9fe2cf97667ece82c310.tar.gz
Move ret_cr16.s from util to freebl. r=nelsonb
-rw-r--r--security/nss/lib/freebl/Makefile1
-rw-r--r--security/nss/lib/freebl/ret_cr16.s (renamed from security/nss/lib/util/ret_cr16.s)0
-rw-r--r--security/nss/lib/util/Makefile6
3 files changed, 1 insertions, 6 deletions
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index b80b3eb4f..3a9af3529 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -165,6 +165,7 @@ endif # AIX
ifeq ($(OS_TARGET), HP-UX)
ifneq ($(OS_TEST), ia64)
# PA-RISC
+ASFILES += ret_cr16.s
ifndef USE_64
FREEBL_BUILD_SINGLE_SHLIB =
HAVE_ABI32_INT32 = 1
diff --git a/security/nss/lib/util/ret_cr16.s b/security/nss/lib/freebl/ret_cr16.s
index d1fffc577..d1fffc577 100644
--- a/security/nss/lib/util/ret_cr16.s
+++ b/security/nss/lib/freebl/ret_cr16.s
diff --git a/security/nss/lib/util/Makefile b/security/nss/lib/util/Makefile
index 97dfe0d7a..afe353d31 100644
--- a/security/nss/lib/util/Makefile
+++ b/security/nss/lib/util/Makefile
@@ -50,12 +50,6 @@ include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
-ifeq ($(OS_TARGET),HP-UX)
-ifneq ($(OS_TEST),ia64)
- ASFILES += ret_cr16.s
-endif
-endif
-
#######################################################################
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################