Author: akhaldi
Date: Tue Jul 20 10:14:07 2010
New Revision: 48130
URL: http://svn.reactos.org/svn/reactos?rev=48130&view=rev
Log:
[MINGW-W64]
- reactos.diff was pushed upstream, so it's not needed anymore.
- Add a missing section.
- Include sect_attribs.h into tlssup.c
Removed:
trunk/reactos/include/reactos/mingw-w64/reactos.diff
Modified:
trunk/reactos/include/reactos/mingw-w64/sect_attribs.h
trunk/reactos/lib/3rdparty/mingw/tlssup.c
Removed: trunk/reactos/include/reactos/mingw-w64/reactos.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/reactos.diff?rev=48129&view=auto
==============================================================================
--- trunk/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/mingw-w64/reactos.diff (removed)
@@ -1,83 +1,0 @@
-Index: internal.h
-===================================================================
---- internal.h (Revision 46537)
-+++ internal.h (Arbeitskopie)
-@@ -35,6 +35,12 @@
- #define __IOINFO_TM_UTF8 1
- #define __IOINFO_TM_UTF16LE 2
-
-+#ifdef _MSC_VER
-+#pragma warning(push)
-+#pragma warning(disable:4214)
-+#pragma warning(disable:4820)
-+#endif
-+
- typedef struct {
- intptr_t osfhnd;
- char osfile;
-@@ -46,6 +52,10 @@
- char pipech2[2];
- } ioinfo;
-
-+#ifdef _MSC_VER
-+#pragma warning(pop)
-+#endif
-+
- #define IOINFO_ARRAY_ELTS (1 << 5)
-
- #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1)))
-Index: oscalls.h
-===================================================================
---- oscalls.h (Revision 46537)
-+++ oscalls.h (Arbeitskopie)
-@@ -30,6 +30,11 @@
- #endif
- #endif
-
-+#ifdef _MSC_VER
-+#pragma warning(push)
-+#pragma warning(disable:4214)
-+#endif
-+
- typedef struct _FTIME
- {
- unsigned short twosecs : 5;
-@@ -46,6 +51,10 @@
- unsigned short year : 7;
- } FDATE;
-
-+#ifdef _MSC_VER
-+#pragma warning(pop)
-+#endif
-+
- typedef FDATE *PFDATE;
-
- #endif
-Index: sect_attribs.h
-===================================================================
---- sect_attribs.h (Revision 46537)
-+++ sect_attribs.h (Arbeitskopie)
-@@ -10,7 +10,7 @@
- #define _ATTRIBUTES shared
- #endif
-
--#if 0
-+#if defined(_MSC_VER)
- /* Reference list of existing section for msvcrt. */
- #pragma section(".CRTMP$XCA",long,_ATTRIBUTES)
- #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES)
-@@ -55,6 +55,14 @@
- #pragma section(".rtc$IZZ",long,read)
- #pragma section(".rtc$TAA",long,read)
- #pragma section(".rtc$TZZ",long,read)
-+#pragma section(".tls",long,read,write)
-+#pragma section(".tls$ZZZ",long,read,write)
- #endif
-
-+#if defined(_MSC_VER)
-+#define _CRTALLOC(x) __declspec(allocate(x))
-+#elif defined(__GNUC__)
- #define _CRTALLOC(x) __attribute__ ((section (x) ))
-+#else
-+#error
-+#endif
Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/sect_attribs.h?rev=48130&r1=48129&r2=48130&view=diff
==============================================================================
--- trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1]
(original)
+++ trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Tue Jul
20 10:14:07 2010
@@ -55,7 +55,9 @@
#pragma section(".rtc$IZZ",long,read)
#pragma section(".rtc$TAA",long,read)
#pragma section(".rtc$TZZ",long,read)
+/* for tlssup.c: */
#pragma section(".tls",long,read,write)
+#pragma section(".tls$AAA",long,read,write)
#pragma section(".tls$ZZZ",long,read,write)
#endif
@@ -64,5 +66,5 @@
#elif defined(__GNUC__)
#define _CRTALLOC(x) __attribute__ ((section (x) ))
#else
-#error
+#error Your compiler is not supported.
#endif
Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.c?rev=48130&r1=48129&r2=48130&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Tue Jul 20 10:14:07
2010
@@ -10,14 +10,13 @@
#undef CRTDLL
#endif
+#include <sect_attribs.h>
+
#include <windows.h>
+
#include <stdio.h>
#include <memory.h>
#include <malloc.h>
-
-#ifndef _CRTALLOC
-#define _CRTALLOC(x) __attribute__ ((section (x) ))
-#endif
#ifndef __INTERNAL_FUNC_DEFINED
#define __INTERNAL_FUNC_DEFINED
