i#111958: MinGW port enhancement: runtime-pseude-reloc-v2

6 files changed, 17 insertions, 468 deletions

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index b57c341e2a23..cd96f3bf2707 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -71,6 +71,11 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
 
 .ELSE
 
+.IF "$(OS)" == "WNT"
+EXTRA_CFLAGS += -mthreads
+LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+.ENDIF
+
 .IF "$(USE_SYSTEM_STL)" != "YES"
 
 OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 2c41ce0dec1d..f7671555f5d5 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -86,17 +86,17 @@ CRYPTOLIB=nss
 
 .IF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-xmlsec_CC=$(CC)
+xmlsec_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 xmlsec_CC+=-shared-libgcc
 .ENDIF
-xmlsec_LIBS=-lmingwthrd
+xmlsec_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
 
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch
index d2ff676facb1..78a7f8f8ab9f 100644
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@ -272,332 +272,6 @@
  	*.$libext)
  	  if test "$pass" = conv; then
  	    deplibs="$deplib $deplibs"
---- misc/xmlsec1-1.2.12/src/mscrypto/certkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/certkeys.c	2009-09-29 15:49:39.643186151 +0200
-@@ -938,7 +938,11 @@
- static void	            xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output);
- static void	            xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoKeyDataSize,
- 
-@@ -1649,7 +1653,11 @@
- static void		xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoKeyDataSize,
- 
---- misc/xmlsec1-1.2.12/src/mscrypto/ciphers.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/ciphers.c	2009-09-29 15:49:39.652528324 +0200
-@@ -802,7 +802,11 @@
-  * AES CBC cipher transforms
-  *
-  ********************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -841,7 +845,11 @@
-     return(&xmlSecMSCryptoAes128CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -880,7 +888,11 @@
-     return(&xmlSecMSCryptoAes192CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -923,7 +935,11 @@
- 
- 
- #ifndef XMLSEC_NO_DES
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),	/* size_t klassSize */
-     xmlSecMSCryptoBlockCipherSize,	/* size_t objSize */
---- misc/xmlsec1-1.2.12/src/mscrypto/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/digests.c	2009-09-29 15:49:39.660554904 +0200
-@@ -329,7 +329,11 @@
-  * SHA1
-  *
-  *****************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* size_t klassSize */
-     xmlSecMSCryptoDigestSize,			/* size_t objSize */
---- misc/xmlsec1-1.2.12/src/mscrypto/keysstore.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/keysstore.c	2009-09-29 15:49:39.667289994 +0200
-@@ -66,7 +66,11 @@
- 								     const xmlChar* name, 
- 								     xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#else
- static xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#endif
-     sizeof(xmlSecKeyStoreKlass),
-     xmlSecMSCryptoKeysStoreSize,
- 
---- misc/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c	2009-09-29 15:49:39.674284044 +0200
-@@ -66,7 +66,11 @@
- static int  	xmlSecMSCryptoRsaPkcs1Process			(xmlSecTransformPtr transform, 
- 								 xmlSecTransformCtxPtr transformCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoRsaPkcs1Size,			/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/mscrypto/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/signatures.c	2009-09-29 15:49:39.682580497 +0200
-@@ -524,7 +524,11 @@
-  * RSA-SHA1 signature transform
-  *
-  ***************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoSignatureSize,		/* xmlSecSize objSize */
-@@ -572,7 +576,11 @@
-  *
-  ***************************************************************************/
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoSignatureSize,	        /* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/mscrypto/symkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/symkeys.c	2009-09-29 15:49:39.691081347 +0200
-@@ -72,7 +72,11 @@
-  * <xmlsec:AESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecKeyDataBinarySize,
- 
-@@ -153,7 +157,11 @@
-  * <xmlsec:DESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecKeyDataBinarySize,
- 
---- misc/xmlsec1-1.2.12/src/mscrypto/x509.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509.c	2009-09-29 15:49:39.699931741 +0200
-@@ -243,7 +243,11 @@
- 
- 
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoX509DataSize,
- 
-@@ -2148,7 +2152,11 @@
- 								 xmlSecSize bufSize,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     sizeof(xmlSecKeyData),
- 
---- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-29 15:55:33.502779834 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-29 15:49:39.708831697 +0200
-@@ -67,7 +67,11 @@
- static int         xmlSecMSCryptoX509StoreInitialize    (xmlSecKeyDataStorePtr store);
- static void        xmlSecMSCryptoX509StoreFinalize      (xmlSecKeyDataStorePtr store);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = {
-+#else
- static xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = {
-+#endif
-     sizeof(xmlSecKeyDataStoreKlass),
-     xmlSecMSCryptoX509StoreSize,
- 
---- misc/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-29 15:55:33.488430535 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-29 15:49:39.717511164 +0200
-@@ -777,7 +777,11 @@
-  * AES CBC cipher transforms
-  *
-  ********************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes128CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes128CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -816,7 +820,11 @@
-     return(&xmlSecNssAes128CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes192CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes192CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -855,7 +863,11 @@
-     return(&xmlSecNssAes192CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes256CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes256CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -897,7 +909,11 @@
- #endif /* XMLSEC_NO_AES */
- 
- #ifndef XMLSEC_NO_DES
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssDes3CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssDes3CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/nss/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/digests.c	2009-09-29 15:49:39.725650968 +0200
-@@ -285,7 +285,11 @@
-  * SHA1 Digest transforms
-  *
-  *****************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssDigestSize,			/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/nss/hmac.c	2009-09-29 15:55:33.409285968 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c	2009-09-29 15:49:39.733673690 +0200
-@@ -502,7 +502,11 @@
- /** 
-  * HMAC SHA1
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -544,7 +548,11 @@
- /** 
-  * HMAC Ripemd160
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -586,7 +594,11 @@
- /** 
-  * HMAC Md5
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacMd5Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacMd5Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/nss/keysstore.c	2009-09-29 15:55:33.422265895 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c	2009-09-29 15:49:39.741628057 +0200
-@@ -489,7 +489,11 @@
-     return NULL ;
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
-+#else
- static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
-+#endif
-        sizeof( xmlSecKeyStoreKlass ) ,
-        xmlSecNssKeysStoreSize ,
-        BAD_CAST "implicit_nss_keys_store" ,
 --- misc/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
 +++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
 @@ -1126,6 +1126,7 @@
@@ -632,133 +306,3 @@
  
  #endif /* XMLSEC_NO_DES */
  
---- misc/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-09-29 15:55:33.440002568 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-09-29 15:49:39.757984523 +0200
-@@ -491,7 +491,11 @@
- static void		xmlSecNssKeyDataDsaDebugXmlDump	(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssPKIKeyDataSize,
- 
-@@ -1124,7 +1128,11 @@
- static void		xmlSecNssKeyDataRsaDebugXmlDump	(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssPKIKeyDataSize,
- 
---- misc/xmlsec1-1.2.12/src/nss/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/signatures.c	2009-09-29 15:49:39.765851110 +0200
-@@ -459,7 +459,11 @@
-  *
-  ***************************************************************************/
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssDsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssDsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssSignatureSize,		/* xmlSecSize objSize */
-@@ -506,7 +510,11 @@
-  * RSA-SHA1 signature transform
-  *
-  ***************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssRsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssRsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssSignatureSize,		/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.12/src/nss/symkeys.c	2009-09-29 15:55:33.448817761 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c	2009-09-29 15:49:39.773211741 +0200
-@@ -856,7 +856,11 @@
-  * <xmlsec:AESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
-@@ -937,7 +941,11 @@
-  * <xmlsec:DESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
-@@ -1019,7 +1027,11 @@
-  * <xmlsec:HMACKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
---- misc/xmlsec1-1.2.12/src/nss/x509.c	2009-09-29 15:55:33.465839785 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c	2009-09-29 15:49:39.784408301 +0200
-@@ -235,7 +235,11 @@
- 
- 
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssX509DataSize,
- 
-@@ -1779,7 +1783,11 @@
- 								 xmlSecSize bufSize,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     sizeof(xmlSecKeyData),
- 
---- misc/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-29 15:55:33.510337681 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-29 15:49:39.791239957 +0200
-@@ -64,7 +64,11 @@
- static void		xmlSecNssX509StoreFinalize	(xmlSecKeyDataStorePtr store);
- static int		xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ;
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
-+#else
- static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
-+#endif
-     sizeof(xmlSecKeyDataStoreKlass),
-     xmlSecNssX509StoreSize,
- 
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 1375ae878497..62d4f704d0e4 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -68,11 +68,11 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
-raptor_CC=$(CC)
+raptor_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 raptor_CC+=-shared-libgcc
 .ENDIF
-raptor_LIBS=-lmingwthrd
+raptor_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 raptor_LIBS+=-lstdc++_s
 .ENDIF
@@ -80,7 +80,7 @@ raptor_LIBS+=-lstdc++_s
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 # do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index d48b7af39cb4..c375c62f0459 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -66,18 +66,18 @@ BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-rasqal_CC=$(CC)
+rasqal_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 rasqal_CC+=-shared-libgcc
 .ENDIF
-rasqal_LIBS=-lmingwthrd
+rasqal_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 rasqal_LIBS+=-lstdc++_s
 .ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index d6acd4d8ea4d..a3a51c0e7b7f 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -66,18 +66,18 @@ BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/librdf
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-redland_CC=$(CC)
+redland_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 redland_CC+=-shared-libgcc
 .ENDIF
-redland_LIBS=-lmingwthrd
+redland_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 redland_LIBS+=-lstdc++_s
 .ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)