diff options
| author | Sebastian Pop <sebastian.pop@amd.com> | 2007-10-28 19:25:05 +0000 |
|---|---|---|
| committer | Sebastian Pop <sebastian.pop@amd.com> | 2007-10-28 19:25:05 +0000 |
| commit | 8573960b361a78776182946a70aac67aec914eab (patch) | |
| tree | 1156f4d244a3b3582ff901b1e083ef9e3e171d19 /boehm-gc | |
| parent | a9bd968fee0a3252a7b867f8c38bad33734423de (diff) | |
2007-10-28 Sebastian Pop <sebastian.pop@amd.com>
* Merge from mainline (127169:129697).
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/graphite@129703 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 10 | ||||
| -rw-r--r-- | boehm-gc/include/private/gcconfig.h | 7 | ||||
| -rw-r--r-- | boehm-gc/pthread_support.c | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index f42faa3accde..60eac094906e 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,13 @@ +2007-10-10 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + PR boehm-gc/33442 + * pthread_support.c (GC_PTR GC_get_thread_stack_base): If stack grows + up, return stack_addr instead of stack_addr - stack_size. + +2007-08-14 David Daney <ddaney@avtrex.com> + + * include/private/gcconfig.h: Handle mips64-linux n64 ABI. + 2007-07-05 H.J. Lu <hongjiu.lu@intel.com> * aclocal.m4: Regenerated. diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h index 288eefb5caf8..00170289ed6f 100644 --- a/boehm-gc/include/private/gcconfig.h +++ b/boehm-gc/include/private/gcconfig.h @@ -1369,7 +1369,12 @@ # define DATAEND (_end) extern int __data_start[]; # define DATASTART ((ptr_t)(__data_start)) -# define ALIGNMENT 4 +# ifdef _MIPS_SZPTR +# define CPP_WORDSZ _MIPS_SZPTR +# define ALIGNMENT (_MIPS_SZPTR/8) +# else +# define ALIGNMENT 4 +# endif # define USE_GENERIC_PUSH_REGS # if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2 # define LINUX_STACKBOTTOM diff --git a/boehm-gc/pthread_support.c b/boehm-gc/pthread_support.c index 8210357766c5..57c8a16a1fa5 100644 --- a/boehm-gc/pthread_support.c +++ b/boehm-gc/pthread_support.c @@ -1153,7 +1153,7 @@ GC_PTR GC_get_thread_stack_base() # ifdef STACK_GROWS_DOWN return stack_addr + stack_size; # else - return stack_addr - stack_size; + return stack_addr; # endif # else |