mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

- Regenerate patch file

Browse Source 
Reported by:	pointyhat via kris
This commit is contained in:
Pav Lucistnik 2004-11-24 08:09:11 +00:00
parent fadfdc8c24
commit acaf5baa5f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=122289
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lang/guile/files/extra-patch-ia64
View File

@ -1,6 +1,6 @@
--- libguile/continuations.c.orig Sat Dec 7 14:41:31 2002 --- libguile/continuations.c.orig Fri Sep 12 18:58:00 2003
+++ libguile/continuations.c Sun Oct 19 21:44:01 2003 +++ libguile/continuations.c Wed Nov 24 07:50:54 2004
@@ -114,16 +114,6 @@ @@ -114,15 +114,6 @@
return 1; return 1;
} }
@ -10,14 +10,13 @@
- long retval; - long retval;
- long first_return; - long first_return;
-}; -};
-extern struct rv getcontext (ucontext_t *); -extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
-extern int setcontext (ucontext_t *);
-#endif /* __ia64__ */ -#endif /* __ia64__ */
- -
/* this may return more than once: the first time with the escape /* this may return more than once: the first time with the escape
procedure, then subsequently with the value to be passed to the procedure, then subsequently with the value to be passed to the
continuation. */ continuation. */
@@ -136,9 +126,6 @@ @@ -135,9 +126,6 @@
scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont); scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont);
long stack_size; long stack_size;
SCM_STACKITEM * src; SCM_STACKITEM * src;
@ -27,11 +26,11 @@
SCM_ENTER_A_SECTION; SCM_ENTER_A_SECTION;
SCM_FLUSH_REGISTER_WINDOWS; SCM_FLUSH_REGISTER_WINDOWS;
@@ -163,17 +150,15 @@ @@ -162,17 +150,15 @@
memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size); memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
#ifdef __ia64__ #ifdef __ia64__
- rv = getcontext (&continuation->ctx); - rv = ia64_getcontext (&continuation->ctx);
- if (rv.first_return) - if (rv.first_return)
+ continuation->backing_store = NULL; + continuation->backing_store = NULL;
+ getcontext(&continuation->ctx); + getcontext(&continuation->ctx);
@ -46,11 +45,11 @@
scm_must_malloc (continuation->backing_store_size, FUNC_NAME); scm_must_malloc (continuation->backing_store_size, FUNC_NAME);
- memcpy (continuation->backing_store, - memcpy (continuation->backing_store,
- (void *) __libc_ia64_register_backing_store_base, - (void *) __libc_ia64_register_backing_store_base,
+ memcpy (continuation->backing_store, (void *)(4UL << 61), + memcpy (continuation->backing_store, (void *)(4UL << 61),
continuation->backing_store_size); continuation->backing_store_size);
*first = 1; *first = 1;
return cont; return cont;
@@ -236,8 +221,7 @@ @@ -235,8 +221,7 @@
continuation->throw_value = val; continuation->throw_value = val;
#ifdef __ia64__ #ifdef __ia64__
@ -60,21 +59,21 @@
continuation->backing_store_size); continuation->backing_store_size);
setcontext (&continuation->ctx); setcontext (&continuation->ctx);
#else #else
--- libguile/gc.c.orig Sun Apr 20 11:16:59 2003 --- libguile/gc.c.orig Wed Nov 24 07:41:44 2004
+++ libguile/gc.c Sun Oct 19 21:44:01 2003 +++ libguile/gc.c Wed Nov 24 07:53:51 2004
@@ -1041,8 +1041,8 @@ @@ -1041,8 +1041,8 @@
scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \ scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \
((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \ ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \
/ sizeof (SCM_STACKITEM))); \ / sizeof (SCM_STACKITEM))); \
- bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base; \ - bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base; \
- top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp; \ - top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp; \
+ bot = (SCM_STACKITEM *) (4UL << 61); \ + bot = (SCM_STACKITEM *) (4UL << 61); \
+ top = (SCM_STACKITEM *) ctx.uc_mcontext.mc_special.bspstore; \ + top = (SCM_STACKITEM *) ctx.uc_mcontext.mc_special.bspstore; \
scm_mark_locations (bot, top - bot); } while (0) scm_mark_locations (bot, top - bot); } while (0)
#else #else
# define SCM_MARK_BACKING_STORE() # define SCM_MARK_BACKING_STORE()
--- libguile/init.c.orig Sat Dec 7 14:41:32 2002 --- libguile/init.c.orig Sun Sep 5 23:05:37 2004
+++ libguile/init.c Sun Oct 19 21:44:01 2003 +++ libguile/init.c Wed Nov 24 07:59:48 2004
@@ -188,6 +188,7 @@ @@ -188,6 +188,7 @@
{ {
scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs), scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
@ -83,13 +82,12 @@
contregs->num_stack_items = 0; contregs->num_stack_items = 0;
contregs->seq = 0; contregs->seq = 0;
SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs); SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
--- libguile/root.c.orig Sat Dec 7 14:41:32 2002 --- libguile/root.c.orig Sat Dec 7 22:41:32 2002
+++ libguile/root.c Sun Oct 19 21:44:01 2003 +++ libguile/root.c Wed Nov 24 08:00:14 2004
@@ -253,7 +253,7 @@ @@ -254,6 +254,7 @@
{
scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs), scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
"inferior root continuation"); "inferior root continuation");
-
+ memset(contregs, 0, sizeof(*contregs)); + memset(contregs, 0, sizeof(*contregs));
contregs->num_stack_items = 0; contregs->num_stack_items = 0;
contregs->dynenv = SCM_EOL; contregs->dynenv = SCM_EOL;