зеркало из https://github.com/github/ruby.git
* symbian/README.SYMBIAN: fixed broken patch and converted to
unified diff. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
ae0224673e
Коммит
732d041dc8
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Mar 15 09:36:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* symbian/README.SYMBIAN: fixed broken patch and converted to
|
||||||
|
unified diff.
|
||||||
|
|
||||||
Mon Mar 15 07:51:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Mon Mar 15 07:51:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
|
* file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
|
||||||
|
|
|
@ -8,68 +8,58 @@
|
||||||
|
|
||||||
Note: if you want to build dynamic extensions support you need to install the latest version of GCC compiler from http://www.codesourcery.com/gnu_toolchains/arm/portal/release643. After that you need to apply a patch below to a header file (SDK_ROOT)\epoc32\include\gcce\gcce.h
|
Note: if you want to build dynamic extensions support you need to install the latest version of GCC compiler from http://www.codesourcery.com/gnu_toolchains/arm/portal/release643. After that you need to apply a patch below to a header file (SDK_ROOT)\epoc32\include\gcce\gcce.h
|
||||||
|
|
||||||
11c11
|
===================================================================
|
||||||
<
|
--- Epoc32/include/gcce/gcce.h
|
||||||
---
|
+++ Epoc32/include/gcce/gcce.h
|
||||||
> @released
|
@@ -22,4 +22,6 @@
|
||||||
18a19
|
#define IMPORT_C __declspec(dllimport)
|
||||||
>
|
#define EXPORT_C __declspec(dllexport)
|
||||||
21a23
|
+#define IMPORT_D __declspec(dllimport)
|
||||||
>
|
+#define EXPORT_D __declspec(dllexport)
|
||||||
24a27,29
|
|
||||||
> #define IMPORT_D __declspec(dllimport)
|
|
||||||
> #define EXPORT_D __declspec(dllexport)
|
@@ -79,6 +81,6 @@
|
||||||
>
|
|
||||||
81,82c86,87
|
// __NAKED__ from cpudefs.h
|
||||||
< #define __NAKED__ __asm
|
-#define __NAKED__ __asm
|
||||||
< #define ____ONLY_USE_NAKED_IN_CIA____ __asm
|
-#define ____ONLY_USE_NAKED_IN_CIA____ __asm
|
||||||
---
|
+#define __NAKED__ __declspec(naked)
|
||||||
> #define __NAKED__ __declspec(naked)
|
+#define ____ONLY_USE_NAKED_IN_CIA____ __declspec(naked)
|
||||||
> #define ____ONLY_USE_NAKED_IN_CIA____ __declspec(naked)
|
|
||||||
92,96c97,98
|
// Int64 and Uint64 from nkern\nklib.h
|
||||||
< namespace std {
|
@@ -94,5 +96,9 @@
|
||||||
< extern "C" {
|
#endif /* __cplusplus */
|
||||||
< #endif /* __cplusplus */
|
|
||||||
<
|
+#if __GNUC__ < 4
|
||||||
< typedef struct __va_list { void *__ap; } va_list;
|
typedef struct __va_list { void *__ap; } va_list;
|
||||||
---
|
+#else
|
||||||
> namespace std { extern "C" {
|
+typedef __builtin_va_list va_list;
|
||||||
> #endif
|
+#endif
|
||||||
97a100,104
|
|
||||||
> #if __GNUC__ < 4
|
|
||||||
> typedef struct __va_list { void *__ap; } va_list;
|
@@ -104,7 +110,13 @@
|
||||||
> #else
|
#endif
|
||||||
> typedef __builtin_va_list va_list;
|
|
||||||
> #endif
|
+#if __GNUC__ < 4
|
||||||
100,102c107
|
#define va_start(ap, parmN) __builtin_va_start(ap.__ap, parmN)
|
||||||
< } /* extern "C" */
|
#define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
|
||||||
< } /* namespace std */
|
#define va_end(ap) __builtin_va_end(ap.__ap)
|
||||||
<
|
+#else
|
||||||
---
|
+#define va_start(ap, parmN) __builtin_va_start(ap, parmN)
|
||||||
> } }
|
+#define va_arg(ap, type) __builtin_va_arg(ap, type)
|
||||||
105a111
|
+#define va_end(ap) __builtin_va_end(ap)
|
||||||
> #if __GNUC__ < 4
|
+#endif
|
||||||
107,109c113,119
|
|
||||||
< #define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
|
|
||||||
< #define va_end(ap) __builtin_va_end(ap.__ap)
|
@@ -139,5 +151,7 @@
|
||||||
<
|
|
||||||
---
|
// Deal with operator new issues here
|
||||||
> #define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
|
+#ifndef __SYMBIAN_STDCPP_SUPPORT__
|
||||||
> #define va_end(ap) __builtin_va_end(ap.__ap)
|
#include "..\symcpp.h"
|
||||||
> #else
|
+#endif
|
||||||
> #define va_start(ap, parmN) __builtin_va_start(ap, parmN)
|
|
||||||
> #define va_arg(ap, type) __builtin_va_arg(ap, type)
|
#ifdef __cplusplus
|
||||||
> #define va_end(ap) __builtin_va_end(ap)
|
===================================================================
|
||||||
> #endif
|
|
||||||
140,141c150,152
|
|
||||||
< // Deal with operator new issues here
|
|
||||||
< #include "../symcpp.h"
|
|
||||||
---
|
|
||||||
> #ifndef __SYMBIAN_STDCPP_SUPPORT__
|
|
||||||
> #include "../symcpp.h"
|
|
||||||
> #endif
|
|
||||||
151a163
|
|
||||||
>
|
|
||||||
|
|
||||||
|
|
||||||
(2) If you want to build from SVN source, following command line binaries are required that are not a part of Symbain SDK.
|
(2) If you want to build from SVN source, following command line binaries are required that are not a part of Symbain SDK.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче