* config/i386/f16cintrin: Remove extra _X86INTRIN_H_INCLUDED check.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d3708cc8082753e9ca55dcb236973c145fcf187..f6ea86473a2638816ca58754ae498c85635c687e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-07  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/f16cintrin: Remove extra _X86INTRIN_H_INCLUDED check.
+
 2011-11-07  Tristan Gingold  <gingold@adacore.com>
 
        * config.gcc (*-*-*vms*): Set c_target_objs, cxx_target_objs.
@@ -26,8 +30,7 @@
  2011-11-07  Sergey Ostanevich  <sergos.gnu@gmail.com>
 
        PR rtl-optimization/47698
-       * ifconv.c (noce_operand_ok): prevent CMOV generation
-       for volatile mem.
+       * ifconv.c (noce_operand_ok): prevent CMOV generation for volatile mem.
 
 2011-11-07  Tristan Gingold  <gingold@adacore.com>
 
@@ -42,7 +45,7 @@
 
        Fix r180999, update ChangeLog
        * config.gcc: Add f16cintrin.h.
-       * f16cintrin.h: Add missing endif.
+       * config/i386/f16cintrin.h: Add missing endif.
 
 2011-11-06  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
@@ -114,8 +117,7 @@
        (c_parser_alignas_specifier): New.
        (c_parser_alignof_expression): Diagnose alignof use for non-C1X.
        Diagnose _Alignof (expression).
-       * c-tree.h (struct c_declspecs): Add align_log and alignas_p
-       fields.
+       * c-tree.h (struct c_declspecs): Add align_log and alignas_p fields.
        (declspecs_add_alignas): Declare.
        * ginclude/stddef.h (max_align_t): Define for C1X and C++11.
        * ginclude/stdalign.h: New.
@@ -129,7 +131,7 @@
        (struct insn_info): Add member fixed_regs_live.
        (note_add_store_info): New typedef.
        (note_add_store): New function.
-       (emit_inc_dec_insn_before): Expect arg to be of type insn_info_t .
+       (emit_inc_dec_insn_before): Expect arg to be of type insn_info_t.
        Use gen_add3_insn / gen_move_insn.
        Check new insn for unwanted clobbers before emitting it.
        (check_for_inc_dec): Rename to...

diff --git a/gcc/config/i386/f16cintrin.h b/gcc/config/i386/f16cintrin.h
index aeca5364bfd7037a613e17f22a65aff14255d1e9..ac827ca0e1280c9b472b69894b4f74eb165a348d 100644 (file)
--- a/gcc/config/i386/f16cintrin.h
+++ b/gcc/config/i386/f16cintrin.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2011
-   Free Software Foundation, Inc.
+/* Copyright (C) 2011 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -22,8 +21,7 @@
    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _X86INTRIN_H_INCLUDED
-#if (!defined(_X86INTRIN_H_INCLUDED) && !defined(_IMMINTRIN_H_INCLUDED))
+#if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED
 # error "Never use <f16intrin.h> directly; include <x86intrin.h> or <immintrin.h> instead."
 #endif
 
@@ -89,6 +87,6 @@ _mm256_cvtps_ph (__m256 __A, const int __I)
 #define _mm256_cvtps_ph(A, I) \
   ((__m128i) __builtin_ia32_vcvtps2ph256 ((__v8sf)(__m256) A, (int) (I)))
 #endif /* __OPTIMIZE */
+
 #endif /* _F16CINTRIN_H_INCLUDED */
 #endif /* __F16C__ */
-#endif /* _X86INTRIN_H_INCLUDED */