Bugzilla 190538: backed out the previous checkin because it broke the OS/2 NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorwtc%netscape.com
Wed, 09 Apr 2003 02:47:59 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 2792 fbd92b6e71795ce8444057b78b049e2300256ef9
parent 2790 0cec4f8816da9a4808f6d2b497f41d03d6020f67
child 2793 be154967a14d93b94f5958a824c09b993e11b4ed
push idunknown
push userunknown
push dateunknown
bugs190538
Bugzilla 190538: backed out the previous checkin because it broke the OS/2 VACPP tinderbox for Mozilla. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
config/rules.mk
lib/ds/Makefile.in
lib/ds/plds.def
lib/libc/src/Makefile.in
lib/libc/src/plc.def
pr/src/Makefile.in
pr/src/nspr.def
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -361,30 +361,32 @@ ifdef NS_USE_GCC
 	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
 else
 	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
 endif # GCC
 endif
 	@echo $(RES) finished
 endif
 
+ifeq ($(OS_ARCH),SunOS)
 $(MAPFILE): $(LIBRARY_NAME).def
 	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),SunOS)
 	grep -v ';-' $< | \
 	sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
+
 ifeq ($(OS_ARCH),OS2)
+$(MAPFILE): $(LIBRARY)
+	rm -f $@
 	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@
 	echo PROTMODE >> $@
 	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@
 	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
 	echo EXPORTS >> $@
-	grep -v ';+' $< | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@
+	$(FILTER) $(LIBRARY) >> $@
 endif
 
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
 	@$(MAKE_OBJDIR)
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
 	$(CCC) -Fo$@ -c $(CCCFLAGS) $<
 else
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -91,17 +91,17 @@ else
 MKSHLIB += -Wl,-M,$(MAPFILE)
 endif
 else
 MKSHLIB += -M $(MAPFILE)
 endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+MAPFILE = $(OBJDIR)/plds.def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
 
 EXTRA_LIBS = $(LIBNSPR)
 
 # On NCR and SCOOS, we can't link with extra libraries when
 # we build a shared library.  If we do so, the linker doesn't
--- a/lib/ds/plds.def
+++ b/lib/ds/plds.def
@@ -1,56 +1,11 @@
-;+#
-;+# 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 Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is Netscape
-;+# Communications Corporation.  Portions created by Netscape are
-;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
-;+# Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the
-;+# terms of the GNU General Public License Version 2 or later (the
-;+# "GPL"), in which case the provisions of the GPL are applicable
-;+# instead of those above.  If you wish to allow use of your
-;+# version of this file only under the terms of the GPL and not to
-;+# allow others to use your version of this file under the MPL,
-;+# indicate your decision by deleting the provisions above and
-;+# replace them with the notice and other provisions required by
-;+# the GPL.  If you do not delete the provisions above, a recipient
-;+# may use your version of this file under either the MPL or the
-;+# GPL.
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+NSPR_4.0 {
-;+    global:
-LIBRARY plds4 ;-
-EXPORTS ;-
+# nm -n -C -p libplds4.so | awk '/[^ ]* T PL_/ {print $3}'
+NSPR_4.0 {
+    global:
 PL_ArenaAllocate;
 PL_ArenaFinish;
 PL_ArenaGrow;
 PL_ArenaRelease;
 PL_CompactArenaPool;
 PL_CompareStrings;
 PL_CompareValues;
 PL_FinishArenaPool;
@@ -63,16 +18,16 @@ PL_HashTableEnumerateEntries;
 PL_HashTableLookup;
 PL_HashTableRawAdd;
 PL_HashTableRawLookup;
 PL_HashTableRawRemove;
 PL_HashTableRemove;
 PL_InitArenaPool;
 PL_NewHashTable;
 libVersionPoint;
-;+    local: *;
-;+};
-;+
-;+NSPR_4.1 {
-;+    global:
+    local: *;
+};
+
+NSPR_4.1 {
+    global:
 PL_HashTableLookupConst;
 PL_HashTableRawLookupConst;
-;+} NSPR_4.0;
+} NSPR_4.0;
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -101,17 +101,17 @@ else
 MKSHLIB += -Wl,-M,$(MAPFILE)
 endif
 else
 MKSHLIB += -M $(MAPFILE)
 endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+MAPFILE = $(OBJDIR)/plc.def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
 
 EXTRA_LIBS = $(LIBNSPR)
 
 # On NCR and SCOOS, we can't link with extra libraries when
 # we build a shared library.  If we do so, the linker doesn't
--- a/lib/libc/src/plc.def
+++ b/lib/libc/src/plc.def
@@ -1,56 +1,11 @@
-;+#
-;+# 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 Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is Netscape
-;+# Communications Corporation.  Portions created by Netscape are
-;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
-;+# Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the
-;+# terms of the GNU General Public License Version 2 or later (the
-;+# "GPL"), in which case the provisions of the GPL are applicable
-;+# instead of those above.  If you wish to allow use of your
-;+# version of this file only under the terms of the GPL and not to
-;+# allow others to use your version of this file under the MPL,
-;+# indicate your decision by deleting the provisions above and
-;+# replace them with the notice and other provisions required by
-;+# the GPL.  If you do not delete the provisions above, a recipient
-;+# may use your version of this file under either the MPL or the
-;+# GPL.
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+NSPR_4.0 {
-;+    global:
-LIBRARY plc4 ;-
-EXPORTS ;-
+# nm -n -C -p libplc4.so | awk '/[^ ]* T PL_/ {print $3}'
+NSPR_4.0 {
+    global:
 PL_Base64Decode;
 PL_Base64Encode;
 PL_CreateOptState;
 PL_DestroyOptState;
 PL_FPrintError;
 PL_GetNextOpt;
 PL_PrintError;
 PL_strcasecmp;
@@ -80,15 +35,15 @@ PL_strnrchr;
 PL_strnrstr;
 PL_strnstr;
 PL_strpbrk;
 PL_strprbrk;
 PL_strrchr;
 PL_strrstr;
 PL_strstr;
 libVersionPoint;
-;+    local: *;
-;+};
-;+
-;+NSPR_4.2 {
-;+    global:
+    local: *;
+};
+
+NSPR_4.2 {
+    global:
 PL_strtok_r;
-;+} NSPR_4.0;
+} NSPR_4.0;
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -137,17 +137,17 @@ ifneq (,$(filter-out 3.2 4.1,$(OS_RELEAS
 ifneq ($(USE_PTHREADS),1)
 BUILD_AIX_RTL_LIBC = 1
 AIX_RTL_LIBC	= $(OBJDIR)/libc.a
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+MAPFILE = $(OBJDIR)/nspr.def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
 
 ifeq ($(OS_ARCH),OSF1)
 ifeq ($(USE_PTHREADS), 1)
 OS_LIBS 	= -lpthread -lrt
 endif
--- a/pr/src/nspr.def
+++ b/pr/src/nspr.def
@@ -1,56 +1,11 @@
-;+#
-;+# 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 Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is Netscape
-;+# Communications Corporation.  Portions created by Netscape are
-;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
-;+# Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the
-;+# terms of the GNU General Public License Version 2 or later (the
-;+# "GPL"), in which case the provisions of the GPL are applicable
-;+# instead of those above.  If you wish to allow use of your
-;+# version of this file only under the terms of the GPL and not to
-;+# allow others to use your version of this file under the MPL,
-;+# indicate your decision by deleting the provisions above and
-;+# replace them with the notice and other provisions required by
-;+# the GPL.  If you do not delete the provisions above, a recipient
-;+# may use your version of this file under either the MPL or the
-;+# GPL.
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+NSPR_4.0 {
-;+	global:
-LIBRARY nspr4 ;-
-EXPORTS ;-
+# nm -n -C -p libnspr4.so | awk '/[^ ]* T PR_/ {print $3}'
+NSPR_4.0 {
+	global:
 		LL_MaxInt;
 		LL_MinInt;
 		LL_Zero;
 		PR_Abort;
 		PR_AddToCounter;
 		PR_Accept;
 		PR_AcceptRead;
 		PR_Access;
@@ -405,44 +360,44 @@ EXPORTS ;-
 		PR_vsxprintf;
 		PRP_DestroyNakedCondVar;
 		PRP_NakedBroadcast;
 		PRP_NakedNotify;
 		PRP_NakedWait;
 		PRP_NewNakedCondVar;
 		PRP_TryLock;
 		libVersionPoint;
-;+	local: *;
-;+};
-;+
-;+NSPRprivate {
-;+	global:
+	local: *;
+};
+
+NSPRprivate {
+	global:
 		GetExecutionEnvironment;
 		PT_FPrintStats;
 		SetExecutionEnvironment;
-;+	local: *;
-;+};
-;+
-;+NSPR_4.1 {
-;+	global:
+	local: *;
+};
+
+NSPR_4.1 {
+	global:
 		PR_ConnectContinue;
 		PR_CreateIOLayer;
 		PR_EmulateAcceptRead;
 		PR_EmulateSendFile;
 		PR_FindFunctionSymbol;
 		PR_FindFunctionSymbolAndLibrary;
 		PR_GetMemMapAlignment;
 		PR_GetNumberOfProcessors;
 		PR_ImportPipe;
 		PR_SetEnv;
-;+} NSPR_4.0;
-;+
-;+NSPR_4.3 {
-;+	global:
+} NSPR_4.0;
+
+NSPR_4.3 {
+	global:
 		LL_MaxUint;
 		PR_CallOnceWithArg;
 		PR_GetLibraryFilePathname;
-;+} NSPR_4.1;
-;+
-;+NSPR_4.4 {
-;+	global:
+} NSPR_4.1;
+
+NSPR_4.4 {
+	global:
 		PR_GetPathSeparator;
-;+} NSPR_4.3;
+} NSPR_4.3;