* libobjc/Makefile.in: Add -DIN_TARGET_LIBS to ALL_CFLAGS.

	* gcc/config/i386/i386.h: If IN_TARGET_LIBS is defined, make
	BIGGEST_FIELD_ALIGNMENT a constant.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32110 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 84c5af1..1079577 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-23  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * config/i386/i386.h: If IN_TARGET_LIBS is defined, make
+       BIGGEST_FIELD_ALIGNMENT a constant.
+
 2000-02-21  Jason Merrill  <jason@casey.cygnus.com>
 
        * dwarf2out.c (output_line_info): Put the marker for the end of

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index e8ae4d9..3965878 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -469,10 +469,15 @@ extern int ix86_arch;
 #define BIGGEST_ALIGNMENT 128
 
 /* The published ABIs say that doubles should be aligned on word
-   boundaries, so lower the aligmnet for structure fields unless
-   -malign_double is set.  */
-
+   boundaries, so lower the aligment for structure fields unless
+   -malign-double is set.  */
+/* BIGGEST_FIELD_ALIGNMENT is also used in libobjc, where it must be
+   constant.  Use the smaller value in that context.  */
+#ifndef IN_TARGET_LIBS
 #define BIGGEST_FIELD_ALIGNMENT (TARGET_ALIGN_DOUBLE ? 64 : 32)
+#else
+#define BIGGEST_FIELD_ALIGNMENT 32
+#endif
 
 /* If defined, a C expression to compute the alignment given to a
    constant that is being placed in memory.  CONSTANT is the constant

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 8ded893..415102f 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-23  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * Makefile.in: Add -DIN_TARGET_LIBS to ALL_CFLAGS.
+
 Thu Sep 23 07:19:12 1999   Chris Ball <cball@fmco.com>
 
        * thr-posix.c (__objc_mutex_deallocate): made deallocate work.

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index ca846c7..e783361 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -60,7 +60,8 @@ RANLIB = @RANLIB@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) -DIN_GCC
+ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) \
+       -DIN_GCC -DIN_TARGET_LIBS
 
 #
 # Define the cc1obj in terms of the CC that is passed on from higher