summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-11 17:46:30 +0000
committerIvan Maidanski <ivmai@mail.ru>2013-09-15 13:12:44 +0400
commit6903ca2a3102ee53f327504c87aa534f4b9d5af4 (patch)
tree1511ec9f1d84e49d4a18c595656cc17b3514db9d
parent481837f909f50083ef81b87d1c9f63a636fa4481 (diff)
downloadbdwgc-6903ca2a3102ee53f327504c87aa534f4b9d5af4.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
-rw-r--r--ChangeLog6
-rw-r--r--include/private/gcconfig.h9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fcefa849..0d830836 100644
--- a/ChangeLog
+++ b/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/include/private/gcconfig.h b/include/private/gcconfig.h
index fb09cf73..0263c13f 100644
--- a/include/private/gcconfig.h
+++ b/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