diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-28 06:11:05 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-28 06:11:05 +0000 |
| commit | 9d67610e7f50422652a746e88cd629a7e6314532 (patch) | |
| tree | aee1fd1ff2e832a1501e45eb0dd5d0134b3aed23 /boehm-gc | |
| parent | 1b264fe712306e06448fc270f77c2debfc5ac58a (diff) | |
Merge from mainline.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@71875 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 14 | ||||
| -rwxr-xr-x | boehm-gc/configure | 2 | ||||
| -rw-r--r-- | boehm-gc/include/private/gcconfig.h | 2 | ||||
| -rw-r--r-- | boehm-gc/os_dep.c | 4 |
4 files changed, 18 insertions, 4 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index f1dc38fe10f..2d6d229b971 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,17 @@ +2003-09-22 Anthony Green <green@redhat.com> + + * os_dep.c: Fix GC_get_stack_base build problem for vanilla elf + "NOSYS" targets. + +2003-09-20 <green@redhat.com> + + * include/private/gcconfig.h: Don't check for __XSCALE__. Instead + check for __arm__ or __thumb__. + +2003-09-09 Alan Modra <amodra@bigpond.net.au> + + * configure: Regenerate. + 2003-08-07 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> Roger Sayle <roger@eyesopen.com> diff --git a/boehm-gc/configure b/boehm-gc/configure index 05905ca3557..0ef1af8e771 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -2385,7 +2385,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h index 29dab213815..45386d78570 100644 --- a/boehm-gc/include/private/gcconfig.h +++ b/boehm-gc/include/private/gcconfig.h @@ -60,7 +60,7 @@ # endif /* Determine the machine type: */ -# if defined(__XSCALE__) +# if defined(__arm__) || defined(__thumb__) # define ARM32 # if !defined(LINUX) # define NOSYS diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c index 00950dd0847..fd195e1c806 100644 --- a/boehm-gc/os_dep.c +++ b/boehm-gc/os_dep.c @@ -963,7 +963,7 @@ ptr_t GC_get_stack_base() #endif /* FREEBSD_STACKBOTTOM */ #if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \ - && !defined(MSWINCE) && !defined(OS2) + && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) ptr_t GC_get_stack_base() { @@ -1021,7 +1021,7 @@ ptr_t GC_get_stack_base() # endif /* STACKBOTTOM */ } -# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS */ +# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */ /* * Register static data segment(s) as roots. |