* varasm.c (assemble_variable) [! defined(ASM_OUTPUT_ALIGNED_COMMON)

        && ! defined (ASM_OUTPUT_ALIGNED_BSS]): Also test
        ! defined(ASM_OUTPUT_ALIGNED_DECL_COMMON) before complaining about
        lack of implemented alignment.

From-SVN: r35277

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb2835d9b574ad9c7cce64ef9b8f4cfdabeb9b54..0f88e0b8bae219e3b37c4272a809d25093b93003 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 26 19:26:21 2000  Hans-Peter Nilsson  <hp@axis.com>
+
+       * varasm.c (assemble_variable) [! defined(ASM_OUTPUT_ALIGNED_COMMON)
+       && ! defined (ASM_OUTPUT_ALIGNED_BSS]): Also test
+       ! defined(ASM_OUTPUT_ALIGNED_DECL_COMMON) before complaining about
+       lack of implemented alignment.
+
 2000-07-26  Geoffrey Keating  <geoffk@cygnus.com>
 
        * emit-rtl.c (gen_lowpart_common) [REAL_ARITHMETIC]: Handle

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 5162a6de61c503b01a231623c6b7bbbfdbe70c98..c79c3806de5c6ff565436287a06365fa94083979 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1499,7 +1499,8 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
       rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT)
                 * (BIGGEST_ALIGNMENT / BITS_PER_UNIT));
       
-#if !defined(ASM_OUTPUT_ALIGNED_COMMON) && !defined(ASM_OUTPUT_ALIGNED_BSS)
+/* Don't continue this line--convex cc version 4.1 would lose.  */
+#if !defined(ASM_OUTPUT_ALIGNED_COMMON) && !defined(ASM_OUTPUT_ALIGNED_DECL_COMMON) && !defined(ASM_OUTPUT_ALIGNED_BSS)
       if ((unsigned HOST_WIDE_INT) DECL_ALIGN (decl) / BITS_PER_UNIT > rounded)
          warning_with_decl 
            (decl, "requested alignment for %s is greater than implemented alignment of %d.",rounded);