diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb1be3c9caf11fdd12be1e8699049d94ad6e473b..8947677d233620f5ea78d0ae02a841f00b7c744f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-13  Carlos O'Donell  <carlos@codesourcery.com>
+
+	Revert this change:
+	2006-10-13  Carlos O'Donell  <carlos@codesourcery.com>
+	* config/elfos.h (MAX_OFILE_ALIGNMENT): Default to largest
+	alignment supported by 32-bit ELF.
+
 2006-10-13  Eric Christopher  <echristo@apple.com>
 
 	* config/darwin.c (darwin_emit_unwind_label): Strip
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index f685293cd9be918d469761ff954f2c797ed37178..a2bd49f909ad7d32f9249d951681fd3984f30dc6 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -40,17 +40,12 @@ Boston, MA 02110-1301, USA.  */
 #undef  USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX ""
 
-/* The biggest alignment supported by ELF. 32-bit ELF supports 
-   section alignment up to (0x80000000 * 8), while 64-bit ELF
-   supports (0x8000000000000000 * 8). If this macro is not
-   defined, the default is the largest alignment supported by
-   32-bit ELF. Use this macro to limit the alignment which can 
-   be specified using the `__attribute__ ((aligned (N)))' 
-   construct.  */
-#if (HOST_BITS_PER_WIDEST_INT >= 64)
-#define MAX_OFILE_ALIGNMENT (((unsigned HOST_WIDEST_INT) 1 << 31) * 8)
-#else
-#define MAX_OFILE_ALIGNMENT (((unsigned HOST_WIDEST_INT) 1 << 28) * 8)
+/* Biggest alignment supported by the object file format of this
+   machine.  Use this macro to limit the alignment which can be
+   specified using the `__attribute__ ((aligned (N)))' construct.  If
+   not defined, the default value is `BIGGEST_ALIGNMENT'.  */
+#ifndef MAX_OFILE_ALIGNMENT
+#define MAX_OFILE_ALIGNMENT (32768 * 8)
 #endif
 
 /* Use periods rather than dollar signs in special g++ assembler names.  */