Author: ydario
Date: Thu Dec 28 15:35:35 2017
New Revision: 1819430
URL: http://svn.apache.org/viewvc?rev=1819430&view=rev
Log:
#i126518# OS/2 link with system libcx0 to use new exception and memory mapping
handling.
Modified:
openoffice/trunk/main/sal/inc/sal/main.h
openoffice/trunk/main/sal/osl/os2/salinit.cxx
openoffice/trunk/main/sal/osl/os2/thread.c
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/inc/os2gcci.mk
Modified: openoffice/trunk/main/sal/inc/sal/main.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/sal/main.h?rev=1819430&r1=1819429&r2=1819430&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/sal/main.h (original)
+++ openoffice/trunk/main/sal/inc/sal/main.h Thu Dec 28 15:35:35 2017
@@ -33,26 +33,6 @@ extern "C" {
void SAL_CALL sal_detail_initialize(int argc, char ** argv);
void SAL_CALL sal_detail_deinitialize();
-#ifdef SAL_OS2
-#include <string.h>
-
-#define INCL_DOSPROCESS
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSMODULEMGR
-#include <os2.h>
-#define INCL_LOADEXCEPTQ
-#include <exceptq.h>
-
-#include <osl/process.h>
-
-#define sal_detail_initialize(a,b) \
- EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \
- LoadExceptq(&exRegRec, NULL, NULL); \
- osl_setCommandArgs(argc, argv);
-#define sal_detail_deinitialize() \
- UninstallExceptq(&exRegRec);
-#endif // SAL_OS2
-
#define SAL_MAIN_WITH_ARGS_IMPL \
int SAL_CALL main(int argc, char ** argv) \
{ \
Modified: openoffice/trunk/main/sal/osl/os2/salinit.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/os2/salinit.cxx?rev=1819430&r1=1819429&r2=1819430&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/os2/salinit.cxx (original)
+++ openoffice/trunk/main/sal/osl/os2/salinit.cxx Thu Dec 28 15:35:35 2017
@@ -19,8 +19,11 @@
*
*************************************************************/
-#include <stdio.h>
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+#include "osl/process.h"
+#include "sal/main.h"
#include "sal/types.h"
#ifdef __cplusplus
@@ -32,14 +35,11 @@ extern "C" {
// replaced by macros in sal/main.h
void SAL_CALL sal_detail_initialize(int argc, char ** argv)
{
- printf("Dead code\n");
- exit(1);
+ osl_setCommandArgs(argc, argv);
}
void SAL_CALL sal_detail_deinitialize()
{
- printf("Dead code\n");
- exit(1);
}
#ifdef __cplusplus
Modified: openoffice/trunk/main/sal/osl/os2/thread.c
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/os2/thread.c?rev=1819430&r1=1819429&r2=1819430&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/os2/thread.c (original)
+++ openoffice/trunk/main/sal/osl/os2/thread.c Thu Dec 28 15:35:35 2017
@@ -34,8 +34,6 @@
#define INCL_DOSEXCEPTIONS
#define INCL_DOSMODULEMGR
#include <os2.h>
-#define INCL_LOADEXCEPTQ
-#include <exceptq.h>
/*
Thread-data structure hidden behind oslThread:
@@ -100,8 +98,6 @@ static void oslWorkerWrapperFunction(voi
{
BOOL rc;
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)pData;
- EXCEPTIONREGISTRATIONRECORD exRegRec = {0};
- LoadExceptq(&exRegRec, NULL, NULL);
#if OSL_DEBUG_LEVEL>0
printf("oslWorkerWrapperFunction pThreadImpl %x, pThreadImpl->m_ThreadId
%d\n", pThreadImpl, pThreadImpl->m_ThreadId);
@@ -132,8 +128,6 @@ printf("pThreadImpl->m_ThreadId %d, abou
#if OSL_DEBUG_LEVEL>0
printf("pThreadImpl->m_ThreadId %d, WinTerminate rc=%d (should be 1)\n",
pThreadImpl->m_ThreadId, rc);
- UninstallExceptq(&exRegRec);
-
#endif
}
Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1819430&r1=1819429&r2=1819430&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Thu Dec 28 15:35:35 2017
@@ -130,6 +130,7 @@ gb_LinkTarget_LDFLAGS := \
-Zhigh-mem \
-Zlinker "DISABLE 1121" \
-Zmap \
+ -lcx \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst
\,/,$(ILIB))))) \
$(subst -L../lib , ,$(SOLARLIB)) \
Modified: openoffice/trunk/main/solenv/inc/os2gcci.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/os2gcci.mk?rev=1819430&r1=1819429&r2=1819430&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/os2gcci.mk (original)
+++ openoffice/trunk/main/solenv/inc/os2gcci.mk Thu Dec 28 15:35:35 2017
@@ -187,6 +187,7 @@ LINK*=gcc
LINKFLAGS= -Zbin-files -Zmap
#27/01/06 bin-files confuses transex/rsc work, removed.
LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
+LINKFLAGS+=-lcx
.IF "$(OS2_ARGS_WILD)" != ""
LINKFLAGS+=-Zargs-wild -Zargs-resp
.ENDIF
