4 files changed, 1 insertions, 32 deletions
diff --git a/config/external/icu/data/icudt58l.dat b/config/external/icu/data/icudt58l.dat
index d981febb1..946a2c868 100644
--- a/config/external/icu/data/icudt58l.dat
+++ b/config/external/icu/data/icudt58l.dat
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index 4b95a32bd..861b7d07d 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -43,17 +43,6 @@ endif
 # Default
 HAVE_FREEBL_LIBS = 1
 
-# 32-bit HP-UX PA-RISC
-ifeq ($(OS_ARCH), HP-UX)
-ifneq ($(OS_TEST), ia64)
-ifndef HAVE_64BIT_BUILD
-HAVE_FREEBL_LIBS =
-HAVE_FREEBL_LIBS_32INT32 = 1
-HAVE_FREEBL_LIBS_32FPU = 1
-endif
-endif
-endif
-
 # SunOS SPARC
 ifeq ($(OS_ARCH), SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
diff --git a/config/milestone.txt b/config/milestone.txt
index 27f2d007f..b617f64b7 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-4.1.1
+4.1.2
diff --git a/config/rules.mk b/config/rules.mk
index a6bd45d11..9a8f61c2d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -386,26 +386,6 @@ endif
 endif
 endif
 
-#
-# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
-# which uses internal symbols first
-#
-ifeq ($(OS_ARCH),HP-UX)
-ifdef IS_COMPONENT
-ifeq ($(GNU_CC)$(GNU_CXX),)
-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-ifneq ($(HAS_EXTRAEXPORTS),1)
-MKSHLIB  += -Wl,+eNSGetModule -Wl,+eerrno
-MKCSHLIB += +eNSGetModule +eerrno
-ifneq ($(OS_TEST),ia64)
-MKSHLIB  += -Wl,+e_shlInit
-MKCSHLIB += +e_shlInit
-endif # !ia64
-endif # !HAS_EXTRAEXPORTS
-endif # non-gnu compilers
-endif # IS_COMPONENT
-endif # HP-UX
-
 ifeq ($(OS_ARCH),AIX)
 ifdef IS_COMPONENT
 ifneq ($(HAS_EXTRAEXPORTS),1)