diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-11-11 06:37:21 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-11-11 06:37:21 +0000 |
| commit | 29d6bee6b5eaa052d805fa8039cacaea28a5d4cb (patch) | |
| tree | 1899e3b76a30873a1dbb0f0776a9ae97f7cd14e2 /textproc/uim/files | |
| parent | 9b214ca0186f376baeb68185e82c5e9ece804184 (diff) | |
| download | ports-29d6bee6b5eaa052d805fa8039cacaea28a5d4cb.tar.gz ports-29d6bee6b5eaa052d805fa8039cacaea28a5d4cb.zip | |
Notes
Diffstat (limited to 'textproc/uim/files')
4 files changed, 76 insertions, 0 deletions
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h b/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h new file mode 100644 index 000000000000..a15469d616fe --- /dev/null +++ b/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h @@ -0,0 +1,13 @@ +--- sigscheme/libgcroots/include/private/gcconfig.h.orig 2007-01-06 12:00:59.000000000 +0900 ++++ sigscheme/libgcroots/include/private/gcconfig.h 2007-11-04 18:15:32.000000000 +0900 +@@ -320,6 +320,10 @@ + # define I386 + # define mach_type_known + # endif ++# if defined(FREEBSD) && (defined(__amd64__)) ++# define X86_64 ++# define mach_type_known ++# endif + # if defined(__NetBSD__) && (defined(i386) || defined(__i386__)) + # define I386 + # define mach_type_known diff --git a/textproc/uim/files/patch-sigscheme_src_alloc.c b/textproc/uim/files/patch-sigscheme_src_alloc.c new file mode 100644 index 000000000000..62ee857a733c --- /dev/null +++ b/textproc/uim/files/patch-sigscheme_src_alloc.c @@ -0,0 +1,31 @@ +--- sigscheme/src/alloc.c.orig 2007-01-07 01:46:46.000000000 +0900 ++++ sigscheme/src/alloc.c 2007-11-04 18:01:05.000000000 +0900 +@@ -181,7 +181,6 @@ + return copied; + } + +-#if 0 + /* For 'name' slot of symbol object on storage-compact. If your malloc(3) does + * not ensure 8-bytes alignment, Complete this function and hook this into + * symbol object creation and modification. -- YamaKen 2006-05-30 */ +@@ -192,17 +191,16 @@ + size_t size; + + /* Use ScmCell-alignment to ensure at least 8-bytes aligned. */ +- if ((uintptr_t)ptr % sizeof(ScmCell)) { ++ if ((uintptr_t)str % sizeof(ScmCell)) { + size = strlen(str) + sizeof(""); +- copied = scm_malloc_aligned8(size); ++ copied = scm_malloc_aligned(size); + strcpy(copied, str); + free(str); + return copied; + } else { +- return ptr; ++ return str; + } + } +-#endif + + /*======================================= + Extendable Local Buffer diff --git a/textproc/uim/files/patch-sigscheme_src_sigscheme.h b/textproc/uim/files/patch-sigscheme_src_sigscheme.h new file mode 100644 index 000000000000..872ddf216b23 --- /dev/null +++ b/textproc/uim/files/patch-sigscheme_src_sigscheme.h @@ -0,0 +1,10 @@ +--- sigscheme/src/sigscheme.h.orig 2007-03-15 01:15:06.000000000 +0900 ++++ sigscheme/src/sigscheme.h 2007-11-04 18:01:05.000000000 +0900 +@@ -1242,6 +1242,7 @@ + SCM_EXPORT void *scm_calloc(size_t number, size_t size); + SCM_EXPORT void *scm_realloc(void *ptr, size_t size); + SCM_EXPORT char *scm_strdup(const char *str); ++SCM_EXPORT char *scm_align_str(char *str); + + /* storage-gc.c */ + SCM_EXPORT void scm_gc_protect(ScmObj *var); diff --git a/textproc/uim/files/patch-sigscheme_src_storage-compact.h b/textproc/uim/files/patch-sigscheme_src_storage-compact.h new file mode 100644 index 000000000000..acaa19292191 --- /dev/null +++ b/textproc/uim/files/patch-sigscheme_src_storage-compact.h @@ -0,0 +1,22 @@ +--- sigscheme/src/storage-compact.h.orig 2007-01-07 01:46:46.000000000 +0900 ++++ sigscheme/src/storage-compact.h 2007-11-04 18:01:05.000000000 +0900 +@@ -639,11 +639,14 @@ + (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ + SCM_SET_Y(SCM_SYMBOL_PTR(o), (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL)) + #define SCM_ISAL_SYMBOL_INIT(o, n, c) \ +- (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ +- SCM_INIT((o), \ +- (c), \ +- (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL, \ +- SCM_PTAG_MISC)) ++ do { \ ++ char *_s = scm_align_str(n); \ ++ (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(_s)), \ ++ SCM_INIT((o), \ ++ (c), \ ++ (scm_uintobj_t)(_s) | SCM_MTAG_SYMBOL, \ ++ SCM_PTAG_MISC)); \ ++ } while (0) + #define SCM_CELL_SYMBOLP(c) SCM_MISC_CELL_TYPEP((c), SYMBOL) + #define SCM_CELL_SYMBOL_FIN(c) \ + do { \ |