diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-11 17:46:30 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-11 17:46:30 +0000 |
| commit | 0d96b1434d828c66f000b9439fdf7f0b00fd5a48 (patch) | |
| tree | 9ac4b5bdf8e10cc8740b61c39ab790f84ef611cb /boehm-gc | |
| parent | c4d3c065ac41032ae167f29e0416ae33405214bd (diff) | |
| download | gcc-0d96b1434d828c66f000b9439fdf7f0b00fd5a48.tar.gz | |
Merge upstream x32 support into boehm-gc
Merge upstream changes
* include/private/gcconfig.h: (ALIGNMENT): Set to 4 for x32.
(CPP_WORDSZ): Set to 32 for x32.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187412 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 6 | ||||
| -rw-r--r-- | boehm-gc/include/private/gcconfig.h | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index fcefa849157..0d830836583 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +2012-05-11 H.J. Lu <hongjiu.lu@intel.com> + + Merge upstream changes + * include/private/gcconfig.h: (ALIGNMENT): Set to 4 for x32. + (CPP_WORDSZ): Set to 32 for x32. + 2012-02-27 Jack Howarth <howarth@bromo.med.uc.edu> Patrick Marlier <patrick.marlier@gmail.com> diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h index fb09cf73cc0..0263c13fd88 100644 --- a/boehm-gc/include/private/gcconfig.h +++ b/boehm-gc/include/private/gcconfig.h @@ -1974,8 +1974,13 @@ # ifdef X86_64 # define MACH_TYPE "X86_64" -# define ALIGNMENT 8 -# define CPP_WORDSZ 64 +# ifdef __ILP32__ +# define ALIGNMENT 4 +# define CPP_WORDSZ 32 +# else +# define ALIGNMENT 8 +# define CPP_WORDSZ 64 +# endif # ifndef HBLKSIZE # define HBLKSIZE 4096 # endif |