public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/gcc] rhel-f41-base: 4.3.2-5
Date: Mon, 29 Jun 2026 12:23:57 GMT [thread overview]
Message-ID: <178273583708.1.6426932397377216597.rpms-gcc-469bb9a9441d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gcc
Branch : rhel-f41-base
Commit : 469bb9a9441d54aa2e0e3c75a2600602b1bb3573
Author : Jakub Jelinek <jakub@fedoraproject.org>
Date : 2008-10-08T13:12:55+00:00
Stats : +2553/-6 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/gcc/c/469bb9a9441d54aa2e0e3c75a2600602b1bb3573?branch=rhel-f41-base
Log:
4.3.2-5
---
diff --git a/.cvsignore b/.cvsignore
index 1adba10..17d5501 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-gcc-4.3.2-20080917.tar.bz2
+gcc-4.3.2-20081008.tar.bz2
fastjar-0.95.tar.gz
diff --git a/gcc43-aes.patch b/gcc43-aes.patch
new file mode 100644
index 0000000..9a45d45
--- /dev/null
+++ b/gcc43-aes.patch
@@ -0,0 +1,1351 @@
+2008-04-04 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config.gcc (extra_headers): Add wmmintrin.h for x86 and x86-64.
+
+ * config/i386/cpuid.h (bit_AES): New.
+ (bit_PCLMUL): Likewise.
+
+ * config/i386/i386.c (pta_flags): Add PTA_AES and PTA_PCLMUL.
+ (override_options): Handle PTA_AES and PTA_PCLMUL. Enable
+ SSE2 if AES or PCLMUL is enabled.
+ (ix86_builtins): Add IX86_BUILTIN_AESENC128,
+ IX86_BUILTIN_AESENCLAST128, IX86_BUILTIN_AESDEC128,
+ IX86_BUILTIN_AESDECLAST128, IX86_BUILTIN_AESIMC128,
+ IX86_BUILTIN_AESKEYGENASSIST128 and IX86_BUILTIN_PCLMULQDQ128.
+ (bdesc_sse_3arg): Add IX86_BUILTIN_PCLMULQDQ128.
+ (bdesc_2arg): Add IX86_BUILTIN_AESENC128,
+ IX86_BUILTIN_AESENCLAST128, IX86_BUILTIN_AESDEC128,
+ IX86_BUILTIN_AESDECLAST128 and IX86_BUILTIN_AESKEYGENASSIST128.
+ (bdesc_1arg): Add IX86_BUILTIN_AESIMC128.
+ (ix86_init_mmx_sse_builtins): Define __builtin_ia32_aesenc128,
+ __builtin_ia32_aesenclast128, __builtin_ia32_aesdec128,
+ __builtin_ia32_aesdeclast128,__builtin_ia32_aesimc128,
+ __builtin_ia32_aeskeygenassist128 and
+ __builtin_ia32_pclmulqdq128.
+ * config/i386/i386.c (ix86_expand_binop_imm_builtin): New.
+ (ix86_expand_builtin): Use it for IX86_BUILTIN_PSLLDQI128 and
+ IX86_BUILTIN_PSRLDQI128. Handle IX86_BUILTIN_AESKEYGENASSIST128.
+
+ * config/i386/i386.h (TARGET_AES): New.
+ (TARGET_PCLMUL): Likewise.
+ (TARGET_CPU_CPP_BUILTINS): Handle TARGET_AES and TARGET_PCLMUL.
+
+ * config/i386/i386.md (UNSPEC_AESENC): New.
+ (UNSPEC_AESENCLAST): Likewise.
+ (UNSPEC_AESDEC): Likewise.
+ (UNSPEC_AESDECLAST): Likewise.
+ (UNSPEC_AESIMC): Likewise.
+ (UNSPEC_AESKEYGENASSIST): Likewise.
+ (UNSPEC_PCLMULQDQ): Likewise.
+
+ * config/i386/i386.opt (maes): New.
+ (mpclmul): Likewise.
+
+ * config/i386/sse.md (aesenc): New pattern.
+ (aesenclast): Likewise.
+ (aesdec): Likewise.
+ (aesdeclast): Likewise.
+ (aesimc): Likewise.
+ (aeskeygenassist): Likewise.
+ (pclmulqdq): Likewise.
+
+ * config/i386/wmmintrin.h: New.
+
+ * doc/extend.texi: Document AES and PCLMUL built-in function.
+
+ * doc/invoke.texi: Document -maes and -mpclmul.
+
+ * g++.dg/other/i386-2.C: Include <wmmintrin.h>.
+ * g++.dg/other/i386-3.C: Likewise.
+ * gcc.target/i386/sse-13.c: Likewise.
+ * gcc.target/i386/sse-14.c: Likewise.
+
+ * gcc.target/i386/aes-check.h: New.
+ * gcc.target/i386/aesdec.c: Likewise.
+ * gcc.target/i386/aesdeclast.c: Likewise.
+ * gcc.target/i386/aesenc.c: Likewise.
+ * gcc.target/i386/aesenclast.c: Likewise.
+ * gcc.target/i386/aesimc.c: Likewise.
+ * gcc.target/i386/aeskeygenassist.c: Likewise.
+ * gcc.target/i386/pclmulqdq.c: Likewise.
+ * gcc.target/i386/pclmul-check.h: Likewise.
+
+ * gcc.target/i386/i386.exp (check_effective_target_aes): New.
+ (check_effective_target_pclmul): Likewise.
+
+--- gcc/config.gcc (revision 133901)
++++ gcc/config.gcc (revision 133902)
+@@ -309,13 +309,15 @@ i[34567]86-*-*)
+ cpu_type=i386
+ extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+ pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
+- nmmintrin.h bmmintrin.h mmintrin-common.h"
++ nmmintrin.h bmmintrin.h mmintrin-common.h
++ wmmintrin.h"
+ ;;
+ x86_64-*-*)
+ cpu_type=i386
+ extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+ pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
+- nmmintrin.h bmmintrin.h mmintrin-common.h"
++ nmmintrin.h bmmintrin.h mmintrin-common.h
++ wmmintrin.h"
+ need_64bit_hwint=yes
+ ;;
+ ia64-*-*)
+--- gcc/config/i386/i386.h (revision 133901)
++++ gcc/config/i386/i386.h (revision 133902)
+@@ -395,6 +395,8 @@ extern int x86_prefetch_sse;
+ #define TARGET_SAHF x86_sahf
+ #define TARGET_RECIP x86_recip
+ #define TARGET_FUSED_MADD x86_fused_muladd
++#define TARGET_AES (TARGET_SSE2 && x86_aes)
++#define TARGET_PCLMUL (TARGET_SSE2 && x86_pclmul)
+
+ #define ASSEMBLER_DIALECT (ix86_asm_dialect)
+
+@@ -683,6 +685,10 @@ extern const char *host_detect_local_cpu
+ builtin_define ("__SSE4_1__"); \
+ if (TARGET_SSE4_2) \
+ builtin_define ("__SSE4_2__"); \
++ if (TARGET_AES) \
++ builtin_define ("__AES__"); \
++ if (TARGET_PCLMUL) \
++ builtin_define ("__PCLMUL__"); \
+ if (TARGET_SSE4A) \
+ builtin_define ("__SSE4A__"); \
+ if (TARGET_SSE5) \
+--- gcc/config/i386/i386.md (revision 133901)
++++ gcc/config/i386/i386.md (revision 133902)
+@@ -186,6 +186,17 @@ (define_constants
+ (UNSPEC_FRCZ 156)
+ (UNSPEC_CVTPH2PS 157)
+ (UNSPEC_CVTPS2PH 158)
++
++ ; For AES support
++ (UNSPEC_AESENC 159)
++ (UNSPEC_AESENCLAST 160)
++ (UNSPEC_AESDEC 161)
++ (UNSPEC_AESDECLAST 162)
++ (UNSPEC_AESIMC 163)
++ (UNSPEC_AESKEYGENASSIST 164)
++
++ ; For PCLMUL support
++ (UNSPEC_PCLMUL 165)
+ ])
+
+ (define_constants
+--- gcc/config/i386/wmmintrin.h (revision 0)
++++ gcc/config/i386/wmmintrin.h (revision 133902)
+@@ -0,0 +1,123 @@
++/* Copyright (C) 2008 Free Software Foundation, Inc.
++
++ This file is part of GCC.
++
++ GCC is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ GCC is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GCC; see the file COPYING. If not, write to
++ the Free Software Foundation, 59 Temple Place - Suite 330,
++ Boston, MA 02111-1307, USA. */
++
++/* As a special exception, if you include this header file into source
++ files compiled by GCC, this header file does not by itself cause
++ the resulting executable to be covered by the GNU General Public
++ License. This exception does not however invalidate any other
++ reasons why the executable file might be covered by the GNU General
++ Public License. */
++
++/* Implemented from the specification included in the Intel C++ Compiler
++ User Guide and Reference, version 10.1. */
++
++#ifndef _WMMINTRIN_H_INCLUDED
++#define _WMMINTRIN_H_INCLUDED
++
++/* We need definitions from the SSE2 header file. */
++#include <emmintrin.h>
++
++#if !defined (__AES__) && !defined (__PCLMUL__)
++# error "AES/PCLMUL instructions not enabled"
++#else
++
++/* AES */
++
++#ifdef __AES__
++/* Performs 1 round of AES decryption of the first m128i using
++ the second m128i as a round key. */
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aesdec_si128 (__m128i __X, __m128i __Y)
++{
++ return (__m128i) __builtin_ia32_aesdec128 ((__v2di)__X, (__v2di)__Y);
++}
++
++/* Performs the last round of AES decryption of the first m128i
++ using the second m128i as a round key. */
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aesdeclast_si128 (__m128i __X, __m128i __Y)
++{
++ return (__m128i) __builtin_ia32_aesdeclast128 ((__v2di)__X,
++ (__v2di)__Y);
++}
++
++/* Performs 1 round of AES encryption of the first m128i using
++ the second m128i as a round key. */
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aesenc_si128 (__m128i __X, __m128i __Y)
++{
++ return (__m128i) __builtin_ia32_aesenc128 ((__v2di)__X, (__v2di)__Y);
++}
++
++/* Performs the last round of AES encryption of the first m128i
++ using the second m128i as a round key. */
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aesenclast_si128 (__m128i __X, __m128i __Y)
++{
++ return (__m128i) __builtin_ia32_aesenclast128 ((__v2di)__X, (__v2di)__Y);
++}
++
++/* Performs the InverseMixColumn operation on the source m128i
++ and stores the result into m128i destination. */
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aesimc_si128 (__m128i __X)
++{
++ return (__m128i) __builtin_ia32_aesimc128 ((__v2di)__X);
++}
++
++/* Generates a m128i round key for the input m128i AES cipher key and
++ byte round constant. The second parameter must be a compile time
++ constant. */
++#ifdef __OPTIMIZE__
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_aeskeygenassist_si128 (__m128i __X, const int __C)
++{
++ return (__m128i) __builtin_ia32_aeskeygenassist128 ((__v2di)__X, __C);
++}
++#else
++#define _mm_aeskeygenassist_si128(X, C) \
++ ((__m128i) __builtin_ia32_aeskeygenassist128 ((__v2di)(__m128i)(X), \
++ (int)(C)))
++#endif
++#endif /* __AES__ */
++
++/* PCLMUL */
++
++#ifdef __PCLMUL__
++/* Performs carry-less integer multiplication of 64-bit halves of
++ 128-bit input operands. The third parameter inducates which 64-bit
++ haves of the input parameters v1 and v2 should be used. It must be
++ a compile time constant. */
++#ifdef __OPTIMIZE__
++extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_mm_clmulepi64_si128 (__m128i __X, __m128i __Y, const int __I)
++{
++ return (__m128i) __builtin_ia32_pclmulqdq128 ((__v2di)__X,
++ (__v2di)__Y, __I);
++}
++#else
++#define _mm_clmulepi64_si128(X, Y, I) \
++ ((__m128i) __builtin_ia32_pclmulqdq128 ((__v2di)(__m128i)(X), \
++ (__v2di)(__m128i)(Y), (int)(I)))
++#endif
++#endif /* __PCLMUL__ */
++
++#endif /* __AES__/__PCLMUL__ */
++
++#endif /* _WMMINTRIN_H_INCLUDED */
+--- gcc/config/i386/cpuid.h (revision 133901)
++++ gcc/config/i386/cpuid.h (revision 133902)
+@@ -33,11 +33,13 @@
+
+ /* %ecx */
+ #define bit_SSE3 (1 << 0)
++#define bit_PCLMUL (1 << 1)
+ #define bit_SSSE3 (1 << 9)
+ #define bit_CMPXCHG16B (1 << 13)
+ #define bit_SSE4_1 (1 << 19)
+ #define bit_SSE4_2 (1 << 20)
+ #define bit_POPCNT (1 << 23)
++#define bit_AES (1 << 25)
+
+ /* %edx */
+ #define bit_CMPXCHG8B (1 << 8)
+--- gcc/config/i386/sse.md (revision 133901)
++++ gcc/config/i386/sse.md (revision 133902)
+@@ -7897,3 +7897,80 @@ (define_insn "sse5_pcom_tf<mode>3"
+ }
+ [(set_attr "type" "ssecmp")
+ (set_attr "mode" "TI")])
++
++(define_insn "aesenc"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "0")
++ (match_operand:V2DI 2 "nonimmediate_operand" "xm")]
++ UNSPEC_AESENC))]
++ "TARGET_AES"
++ "aesenc\t{%2, %0|%0, %2}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "aesenclast"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "0")
++ (match_operand:V2DI 2 "nonimmediate_operand" "xm")]
++ UNSPEC_AESENCLAST))]
++ "TARGET_AES"
++ "aesenclast\t{%2, %0|%0, %2}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "aesdec"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "0")
++ (match_operand:V2DI 2 "nonimmediate_operand" "xm")]
++ UNSPEC_AESDEC))]
++ "TARGET_AES"
++ "aesdec\t{%2, %0|%0, %2}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "aesdeclast"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "0")
++ (match_operand:V2DI 2 "nonimmediate_operand" "xm")]
++ UNSPEC_AESDECLAST))]
++ "TARGET_AES"
++ "aesdeclast\t{%2, %0|%0, %2}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "aesimc"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "nonimmediate_operand" "xm")]
++ UNSPEC_AESIMC))]
++ "TARGET_AES"
++ "aesimc\t{%1, %0|%0, %1}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "aeskeygenassist"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "nonimmediate_operand" "xm")
++ (match_operand:SI 2 "const_0_to_255_operand" "n")]
++ UNSPEC_AESKEYGENASSIST))]
++ "TARGET_AES"
++ "aeskeygenassist\t{%2, %1, %0|%0, %1, %2}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
++
++(define_insn "pclmulqdq"
++ [(set (match_operand:V2DI 0 "register_operand" "=x")
++ (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "0")
++ (match_operand:V2DI 2 "nonimmediate_operand" "xm")
++ (match_operand:SI 3 "const_0_to_255_operand" "n")]
++ UNSPEC_PCLMUL))]
++ "TARGET_PCLMUL"
++ "pclmulqdq\t{%3, %2, %0|%0, %2, %3}"
++ [(set_attr "type" "sselog1")
++ (set_attr "prefix_extra" "1")
++ (set_attr "mode" "TI")])
+--- gcc/config/i386/i386.opt (revision 133901)
++++ gcc/config/i386/i386.opt (revision 133902)
+@@ -275,3 +275,11 @@ Target Report Var(x86_fused_muladd) Init
+ Enable automatic generation of fused floating point multiply-add instructions
+ if the ISA supports such instructions. The -mfused-madd option is on by
+ default.
++
++maes
++Target Report RejectNegative Var(x86_aes)
++Support AES built-in functions and code generation
++
++mpclmul
++Target Report RejectNegative Var(x86_pclmul)
++Support PCLMUL built-in functions and code generation
+--- gcc/config/i386/i386.c (revision 133901)
++++ gcc/config/i386/i386.c (revision 133902)
+@@ -2077,7 +2077,9 @@ override_options (void)
+ PTA_NO_SAHF = 1 << 13,
+ PTA_SSE4_1 = 1 << 14,
+ PTA_SSE4_2 = 1 << 15,
+- PTA_SSE5 = 1 << 16
++ PTA_SSE5 = 1 << 16,
++ PTA_AES = 1 << 17,
++ PTA_PCLMUL = 1 << 18
+ };
+
+ static struct pta
+@@ -2384,6 +2386,10 @@ override_options (void)
+ x86_prefetch_sse = true;
+ if (!(TARGET_64BIT && (processor_alias_table[i].flags & PTA_NO_SAHF)))
+ x86_sahf = true;
++ if (processor_alias_table[i].flags & PTA_AES)
++ x86_aes = true;
++ if (processor_alias_table[i].flags & PTA_PCLMUL)
++ x86_pclmul = true;
+
+ break;
+ }
+@@ -2427,6 +2433,14 @@ override_options (void)
+ if (i == pta_size)
+ error ("bad value (%s) for -mtune= switch", ix86_tune_string);
+
++ /* Enable SSE2 if AES or PCLMUL is enabled. */
++ if ((x86_aes || x86_pclmul)
++ && !(ix86_isa_flags_explicit & OPTION_MASK_ISA_SSE2))
++ {
++ ix86_isa_flags |= OPTION_MASK_ISA_SSE2_SET;
++ ix86_isa_flags_explicit |= OPTION_MASK_ISA_SSE2_SET;
++ }
++
+ ix86_tune_mask = 1u << ix86_tune;
+ for (i = 0; i < X86_TUNE_LAST; ++i)
+ ix86_tune_features[i] &= ix86_tune_mask;
+@@ -17545,6 +17559,17 @@ enum ix86_builtins
+
+ IX86_BUILTIN_PCMPGTQ,
+
++ /* AES instructions */
++ IX86_BUILTIN_AESENC128,
++ IX86_BUILTIN_AESENCLAST128,
++ IX86_BUILTIN_AESDEC128,
++ IX86_BUILTIN_AESDECLAST128,
++ IX86_BUILTIN_AESIMC128,
++ IX86_BUILTIN_AESKEYGENASSIST128,
++
++ /* PCLMUL instruction */
++ IX86_BUILTIN_PCLMULQDQ128,
++
+ /* TFmode support builtins. */
+ IX86_BUILTIN_INFQ,
+ IX86_BUILTIN_FABSQ,
+@@ -17900,6 +17925,9 @@ static const struct builtin_description
+ { OPTION_MASK_ISA_SSE4_1, CODE_FOR_sse4_1_pblendw, "__builtin_ia32_pblendw128", IX86_BUILTIN_PBLENDW128, UNKNOWN, 0 },
+ { OPTION_MASK_ISA_ROUND, CODE_FOR_sse4_1_roundsd, 0, IX86_BUILTIN_ROUNDSD, UNKNOWN, 0 },
+ { OPTION_MASK_ISA_ROUND, CODE_FOR_sse4_1_roundss, 0, IX86_BUILTIN_ROUNDSS, UNKNOWN, 0 },
++
++ /* PCLMUL */
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_pclmulqdq, 0, IX86_BUILTIN_PCLMULQDQ128, UNKNOWN, 0 },
+ };
+
+ static const struct builtin_description bdesc_2arg[] =
+@@ -18210,6 +18238,13 @@ static const struct builtin_description
+
+ /* SSE4.2 */
+ { OPTION_MASK_ISA_SSE4_2, CODE_FOR_sse4_2_gtv2di3, "__builtin_ia32_pcmpgtq", IX86_BUILTIN_PCMPGTQ, UNKNOWN, 0 },
++
++ /* AES */
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aesenc, 0, IX86_BUILTIN_AESENC128, UNKNOWN, 0 },
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aesenclast, 0, IX86_BUILTIN_AESENCLAST128, UNKNOWN, 0 },
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aesdec, 0, IX86_BUILTIN_AESDEC128, UNKNOWN, 0 },
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aesdeclast, 0, IX86_BUILTIN_AESDECLAST128, UNKNOWN, 0 },
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aeskeygenassist, 0, IX86_BUILTIN_AESKEYGENASSIST128, UNKNOWN, 0 },
+ };
+
+ static const struct builtin_description bdesc_1arg[] =
+@@ -18285,6 +18320,9 @@ static const struct builtin_description
+ /* Fake 1 arg builtins with a constant smaller than 8 bits as the 2nd arg. */
+ { OPTION_MASK_ISA_SSE4_1, CODE_FOR_sse4_1_roundpd, 0, IX86_BUILTIN_ROUNDPD, UNKNOWN, 0 },
+ { OPTION_MASK_ISA_SSE4_1, CODE_FOR_sse4_1_roundps, 0, IX86_BUILTIN_ROUNDPS, UNKNOWN, 0 },
++
++ /* AES */
++ { OPTION_MASK_ISA_SSE2, CODE_FOR_aesimc, 0, IX86_BUILTIN_AESIMC128, UNKNOWN, 0 },
+ };
+
+ /* SSE5 */
+@@ -19518,6 +19556,25 @@ ix86_init_mmx_sse_builtins (void)
+ NULL_TREE);
+ def_builtin_const (OPTION_MASK_ISA_SSE4_2 | OPTION_MASK_ISA_64BIT, "__builtin_ia32_crc32di", ftype, IX86_BUILTIN_CRC32DI);
+
++ /* AES */
++ if (TARGET_AES)
++ {
++ /* Define AES built-in functions only if AES is enabled. */
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aesenc128", v2di_ftype_v2di_v2di, IX86_BUILTIN_AESENC128);
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aesenclast128", v2di_ftype_v2di_v2di, IX86_BUILTIN_AESENCLAST128);
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aesdec128", v2di_ftype_v2di_v2di, IX86_BUILTIN_AESDEC128);
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aesdeclast128", v2di_ftype_v2di_v2di, IX86_BUILTIN_AESDECLAST128);
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aesimc128", v2di_ftype_v2di, IX86_BUILTIN_AESIMC128);
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_aeskeygenassist128", v2di_ftype_v2di_int, IX86_BUILTIN_AESKEYGENASSIST128);
++ }
++
++ /* PCLMUL */
++ if (TARGET_PCLMUL)
++ {
++ /* Define PCLMUL built-in function only if PCLMUL is enabled. */
++ def_builtin_const (OPTION_MASK_ISA_SSE2, "__builtin_ia32_pclmulqdq128", v2di_ftype_v2di_v2di_int, IX86_BUILTIN_PCLMULQDQ128);
++ }
++
+ /* AMDFAM10 SSE4A New built-ins */
+ def_builtin (OPTION_MASK_ISA_SSE4A, "__builtin_ia32_movntsd", void_ftype_pdouble_v2df, IX86_BUILTIN_MOVNTSD);
+ def_builtin (OPTION_MASK_ISA_SSE4A, "__builtin_ia32_movntss", void_ftype_pfloat_v4sf, IX86_BUILTIN_MOVNTSS);
+@@ -19793,6 +19850,44 @@ ix86_expand_crc32 (enum insn_code icode,
+ return target;
+ }
+
++/* Subroutine of ix86_expand_builtin to take care of binop insns
++ with an immediate. */
++
++static rtx
++ix86_expand_binop_imm_builtin (enum insn_code icode, tree exp,
++ rtx target)
++{
++ rtx pat;
++ tree arg0 = CALL_EXPR_ARG (exp, 0);
++ tree arg1 = CALL_EXPR_ARG (exp, 1);
++ rtx op0 = expand_normal (arg0);
++ rtx op1 = expand_normal (arg1);
++ enum machine_mode tmode = insn_data[icode].operand[0].mode;
++ enum machine_mode mode0 = insn_data[icode].operand[1].mode;
++ enum machine_mode mode1 = insn_data[icode].operand[2].mode;
++
++ if (! (*insn_data[icode].operand[1].predicate) (op0, mode1))
++ {
++ op0 = copy_to_reg (op0);
++ op0 = simplify_gen_subreg (mode0, op0, GET_MODE (op0), 0);
++ }
++
++ if (! (*insn_data[icode].operand[2].predicate) (op1, mode1))
++ {
++ error ("the last operand must be an immediate");
++ return const0_rtx;
++ }
++
++ target = gen_reg_rtx (V2DImode);
++ pat = GEN_FCN (icode) (simplify_gen_subreg (tmode, target,
++ V2DImode, 0),
++ op0, op1);
++ if (! pat)
++ return 0;
++ emit_insn (pat);
++ return target;
++}
++
+ /* Subroutine of ix86_expand_builtin to take care of binop insns. */
+
+ static rtx
+@@ -20889,34 +20984,18 @@ ix86_expand_builtin (tree exp, rtx targe
+ return target;
+
+ case IX86_BUILTIN_PSLLDQI128:
++ return ix86_expand_binop_imm_builtin (CODE_FOR_sse2_ashlti3,
++ exp, target);
++ break;
++
+ case IX86_BUILTIN_PSRLDQI128:
+- icode = (fcode == IX86_BUILTIN_PSLLDQI128 ? CODE_FOR_sse2_ashlti3
+- : CODE_FOR_sse2_lshrti3);
+- arg0 = CALL_EXPR_ARG (exp, 0);
+- arg1 = CALL_EXPR_ARG (exp, 1);
+- op0 = expand_normal (arg0);
+- op1 = expand_normal (arg1);
+- tmode = insn_data[icode].operand[0].mode;
+- mode1 = insn_data[icode].operand[1].mode;
+- mode2 = insn_data[icode].operand[2].mode;
++ return ix86_expand_binop_imm_builtin (CODE_FOR_sse2_lshrti3,
++ exp, target);
++ break;
+
+- if (! (*insn_data[icode].operand[1].predicate) (op0, mode1))
+- {
+- op0 = copy_to_reg (op0);
+- op0 = simplify_gen_subreg (mode1, op0, GET_MODE (op0), 0);
+- }
+- if (! (*insn_data[icode].operand[2].predicate) (op1, mode2))
+- {
+- error ("shift must be an immediate");
+- return const0_rtx;
+- }
+- target = gen_reg_rtx (V2DImode);
+- pat = GEN_FCN (icode) (simplify_gen_subreg (tmode, target, V2DImode, 0),
+- op0, op1);
+- if (! pat)
+- return 0;
+- emit_insn (pat);
+- return target;
++ case IX86_BUILTIN_AESKEYGENASSIST128:
++ return ix86_expand_binop_imm_builtin (CODE_FOR_aeskeygenassist,
++ exp, target);
+
+ case IX86_BUILTIN_FEMMS:
+ emit_insn (gen_mmx_femms ());
+--- gcc/doc/extend.texi (revision 133901)
++++ gcc/doc/extend.texi (revision 133902)
+@@ -8013,6 +8013,27 @@ depending on the size of @code{unsigned
+ Generates the @code{popcntq} machine instruction.
+ @end table
+
++The following built-in functions are available when @option{-maes} is
++used. All of them generate the machine instruction that is part of the
++name.
++
++@smallexample
++v2di __builtin_ia32_aesenc128 (v2di, v2di)
++v2di __builtin_ia32_aesenclast128 (v2di, v2di)
++v2di __builtin_ia32_aesdec128 (v2di, v2di)
++v2di __builtin_ia32_aesdeclast128 (v2di, v2di)
++v2di __builtin_ia32_aeskeygenassist128 (v2di, const int)
++v2di __builtin_ia32_aesimc128 (v2di)
++@end smallexample
++
++The following built-in function is available when @option{-mpclmul} is
++used.
++
++@table @code
++@item v2di __builtin_ia32_pclmulqdq128 (v2di, v2di, const int)
++Generates the @code{pclmulqdq} machine instruction.
++@end table
++
+ The following built-in functions are available when @option{-msse4a} is used.
+ All of them generate the machine instruction that is part of the name.
+
+--- gcc/doc/invoke.texi (revision 133901)
++++ gcc/doc/invoke.texi (revision 133902)
+@@ -551,6 +551,7 @@ Objective-C and Objective-C++ Dialects}.
+ -mno-wide-multiply -mrtd -malign-double @gol
+ -mpreferred-stack-boundary=@var{num} -mcld -mcx16 -msahf -mrecip @gol
+ -mmmx -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -msse4 @gol
++-maes -mpclmul @gol
+ -msse4a -m3dnow -mpopcnt -mabm -msse5 @gol
+ -mthreads -mno-align-stringops -minline-all-stringops @gol
+ -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol
+@@ -10732,6 +10733,10 @@ preferred alignment to @option{-mpreferr
+ @itemx -mno-sse4.2
+ @item -msse4
+ @itemx -mno-sse4
++@itemx -maes
++@itemx -mno-aes
++@itemx -mpclmul
++@itemx -mno-pclmul
+ @item -msse4a
+ @item -mno-sse4a
+ @item -msse5
+@@ -10749,8 +10754,8 @@ preferred alignment to @option{-mpreferr
+ @opindex m3dnow
+ @opindex mno-3dnow
+ These switches enable or disable the use of instructions in the MMX,
+-SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4A, SSE5, ABM or 3DNow!@: extended
+-instruction sets.
++SSE, SSE2, SSE3, SSSE3, SSE4.1, AES, PCLMUL, SSE4A, SSE5, ABM or
++3DNow!@: extended instruction sets.
+ These extensions are also available as built-in functions: see
+ @ref{X86 Built-in Functions}, for details of the functions enabled and
+ disabled by these switches.
+--- gcc/testsuite/gcc.target/i386/sse-14.c (revision 133901)
++++ gcc/testsuite/gcc.target/i386/sse-14.c (revision 133902)
+@@ -1,14 +1,15 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O0 -march=k8 -m3dnow -msse4 -msse5" } */
++/* { dg-options "-O0 -march=k8 -m3dnow -msse4 -msse5 -maes -mpclmul" } */
+
+ /* Test that the intrinsics compile without optimization. All of them are
+- defined as inline functions in {,x,e,p,t,s,a,b}mmintrin.h and mm3dnow.h
++ defined as inline functions in {,x,e,p,t,s,w,a,b}mmintrin.h and mm3dnow.h
+ that reference the proper builtin functions. Defining away "extern" and
+ "__inline" results in all of them being compiled as proper functions. */
+
+ #define extern
+ #define __inline
+
++#include <wmmintrin.h>
+ #include <bmmintrin.h>
+ #include <smmintrin.h>
+ #include <mm3dnow.h>
+@@ -44,6 +45,10 @@
+ test_1x (_mm_extracti_si64, __m128i, __m128i, 1, 1)
+ test_2x (_mm_inserti_si64, __m128i, __m128i, __m128i, 1, 1)
+
++/* wmmintrin.h */
++test_1 (_mm_aeskeygenassist_si128, __m128i, __m128i, 1)
++test_2 (_mm_clmulepi64_si128, __m128i, __m128i, __m128i, 1)
++
+ /* smmintrin.h */
+ test_2 (_mm_blend_epi16, __m128i, __m128i, __m128i, 1)
+ test_2 (_mm_blend_ps, __m128, __m128, __m128, 1)
+--- gcc/testsuite/gcc.target/i386/i386.exp (revision 133901)
++++ gcc/testsuite/gcc.target/i386/i386.exp (revision 133902)
+@@ -51,6 +51,34 @@ proc check_effective_target_sse4 { } {
+ } "-O2 -msse4.1" ]
+ }
+
++# Return 1 if aes instructions can be compiled.
++proc check_effective_target_aes { } {
++ return [check_no_compiler_messages aes object {
++ typedef long long __m128i __attribute__ ((__vector_size__ (16)));
++ typedef long long __v2di __attribute__ ((__vector_size__ (16)));
++
++ __m128i _mm_aesimc_si128 (__m128i __X)
++ {
++ return (__m128i) __builtin_ia32_aesimc128 ((__v2di)__X);
++ }
++ } "-O2 -maes" ]
++}
++
++# Return 1 if pclmul instructions can be compiled.
++proc check_effective_target_pclmul { } {
++ return [check_no_compiler_messages pclmul object {
++ typedef long long __m128i __attribute__ ((__vector_size__ (16)));
++ typedef long long __v2di __attribute__ ((__vector_size__ (16)));
++
++ __m128i pclmulqdq_test (__m128i __X, __m128i __Y)
++ {
++ return (__m128i) __builtin_ia32_pclmulqdq128 ((__v2di)__X,
++ (__v2di)__Y,
++ 1);
++ }
++ } "-O2 -mpclmul" ]
++}
++
+ # Return 1 if sse4a instructions can be compiled.
+ proc check_effective_target_sse4a { } {
+ return [check_no_compiler_messages sse4a object {
+--- gcc/testsuite/gcc.target/i386/aesdeclast.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aesdeclast.c (revision 133902)
+@@ -0,0 +1,69 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i src1[NUM];
++static __m128i src2[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set of
++ input/output vectors). */
++
++static void
++init_data (__m128i *s1, __m128i *s2, __m128i *d)
++{
++ int i;
++
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x5d53475d, 0x63746f72,
++ 0x73745665, 0x7b5b5465);
++ s2[i] = _mm_setr_epi32 (0x726f6e5d, 0x5b477565,
++ 0x68617929, 0x48692853);
++ d[i] = _mm_setr_epi32 (0x72a593d0, 0xd410637b,
++ 0x6b317f95, 0xc5a391ef);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, src2, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aesdeclast_si128 (src1[i], src2[i]);
++ resdst[i + 1] = _mm_aesdeclast_si128 (src1[i + 1], src2[i + 1]);
++ resdst[i + 2] = _mm_aesdeclast_si128 (src1[i + 2], src2[i + 2]);
++ resdst[i + 3] = _mm_aesdeclast_si128 (src1[i + 3], src2[i + 3]);
++ resdst[i + 4] = _mm_aesdeclast_si128 (src1[i + 4], src2[i + 4]);
++ resdst[i + 5] = _mm_aesdeclast_si128 (src1[i + 5], src2[i + 5]);
++ resdst[i + 6] = _mm_aesdeclast_si128 (src1[i + 6], src2[i + 6]);
++ resdst[i + 7] = _mm_aesdeclast_si128 (src1[i + 7], src2[i + 7]);
++ resdst[i + 8] = _mm_aesdeclast_si128 (src1[i + 8], src2[i + 8]);
++ resdst[i + 9] = _mm_aesdeclast_si128 (src1[i + 9], src2[i + 9]);
++ resdst[i + 10] = _mm_aesdeclast_si128 (src1[i + 10], src2[i + 10]);
++ resdst[i + 11] = _mm_aesdeclast_si128 (src1[i + 11], src2[i + 11]);
++ resdst[i + 12] = _mm_aesdeclast_si128 (src1[i + 12], src2[i + 12]);
++ resdst[i + 13] = _mm_aesdeclast_si128 (src1[i + 13], src2[i + 13]);
++ resdst[i + 14] = _mm_aesdeclast_si128 (src1[i + 14], src2[i + 14]);
++ resdst[i + 15] = _mm_aesdeclast_si128 (src1[i + 15], src2[i + 15]);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp (edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/gcc.target/i386/pclmulqdq.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pclmulqdq.c (revision 133902)
+@@ -0,0 +1,87 @@
++/* { dg-do run } */
++/* { dg-require-effective-target pclmul } */
++/* { dg-options "-O2 -mpclmul" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "pclmul-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i s1[NUM];
++static __m128i s2[NUM];
++/* We need this array to generate mem form of inst */
++static __m128i s2m[NUM];
++
++static __m128i e_00[NUM];
++static __m128i e_01[NUM];
++static __m128i e_10[NUM];
++static __m128i e_11[NUM];
++
++static __m128i d_00[NUM];
++static __m128i d_01[NUM];
++static __m128i d_10[NUM];
++static __m128i d_11[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set
++ of input/output vectors). */
++static void
++init_data (__m128i *ls1, __m128i *ls2, __m128i *le_00, __m128i *le_01,
++ __m128i *le_10, __m128i *le_11)
++{
++ int i;
++
++ for (i = 0; i < NUM; i++)
++ {
++ ls1[i] = _mm_set_epi32 (0x7B5B5465, 0x73745665,
++ 0x63746F72, 0x5D53475D);
++ ls2[i] = _mm_set_epi32 (0x48692853, 0x68617929,
++ 0x5B477565, 0x726F6E5D);
++ s2m[i] = _mm_set_epi32 (0x48692853, 0x68617929,
++ 0x5B477565, 0x726F6E5D);
++ le_00[i] = _mm_set_epi32 (0x1D4D84C8, 0x5C3440C0,
++ 0x929633D5, 0xD36F0451);
++ le_01[i] = _mm_set_epi32 (0x1A2BF6DB, 0x3A30862F,
++ 0xBABF262D, 0xF4B7D5C9);
++ le_10[i] = _mm_set_epi32 (0x1BD17C8D, 0x556AB5A1,
++ 0x7FA540AC, 0x2A281315);
++ le_11[i] = _mm_set_epi32 (0x1D1E1F2C, 0x592E7C45,
++ 0xD66EE03E, 0x410FD4ED);
++ }
++}
++
++static void
++pclmul_test (void)
++{
++ int i;
++
++ init_data (s1, s2, e_00, e_01, e_10, e_11);
++
++ for (i = 0; i < NUM; i += 2)
++ {
++ d_00[i] = _mm_clmulepi64_si128 (s1[i], s2m[i], 0x00);
++ d_01[i] = _mm_clmulepi64_si128 (s1[i], s2[i], 0x01);
++ d_10[i] = _mm_clmulepi64_si128 (s1[i], s2[i], 0x10);
++ d_11[i] = _mm_clmulepi64_si128 (s1[i], s2[i], 0x11);
++
++ d_11[i + 1] = _mm_clmulepi64_si128 (s1[i + 1], s2[i + 1], 0x11);
++ d_00[i + 1] = _mm_clmulepi64_si128 (s1[i + 1], s2[i + 1], 0x00);
++ d_10[i + 1] = _mm_clmulepi64_si128 (s1[i + 1], s2m[i + 1], 0x10);
++ d_01[i + 1] = _mm_clmulepi64_si128 (s1[i + 1], s2[i + 1], 0x01);
++ }
++
++ for (i = 0; i < NUM; i++)
++ {
++ if (memcmp (d_00 + i, e_00 + i, sizeof (__m128i)))
++ abort ();
++ if (memcmp (d_01 + i, e_01 + i, sizeof (__m128i)))
++ abort ();
++ if (memcmp (d_10 + i, e_10 + i, sizeof (__m128i)))
++ abort ();
++ if (memcmp(d_11 + i, e_11 + i, sizeof (__m128i)))
++ abort ();
++ }
++}
+--- gcc/testsuite/gcc.target/i386/aes-check.h (revision 0)
++++ gcc/testsuite/gcc.target/i386/aes-check.h (revision 133902)
+@@ -0,0 +1,30 @@
++#include <stdio.h>
++#include <stdlib.h>
++
++#include "cpuid.h"
++
++static void aes_test (void);
++
++int
++main ()
++{
++ unsigned int eax, ebx, ecx, edx;
++
++ if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx))
++ return 0;
++
++ /* Run AES test only if host has AES support. */
++ if (ecx & bit_AES)
++ {
++ aes_test ();
++#ifdef DEBUG
++ printf ("PASSED\n");
++#endif
++ }
++#ifdef DEBUG
++ else
++ printf ("SKIPPED\n");
++#endif
++
++ return 0;
++}
+--- gcc/testsuite/gcc.target/i386/pclmul-check.h (revision 0)
++++ gcc/testsuite/gcc.target/i386/pclmul-check.h (revision 133902)
+@@ -0,0 +1,30 @@
++#include <stdio.h>
++#include <stdlib.h>
++
++#include "cpuid.h"
++
++static void pclmul_test (void);
++
++int
++main ()
++{
++ unsigned int eax, ebx, ecx, edx;
++
++ if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx))
++ return 0;
++
++ /* Run PCLMULQDQ test only if host has PCLMULQDQ support. */
++ if (ecx & bit_PCLMUL)
++ {
++ pclmul_test ();
++#ifdef DEBUG
++ printf ("PASSED\n");
++#endif
++ }
++#ifdef DEBUG
++ else
++ printf ("SKIPPED\n");
++#endif
++
++ return 0;
++}
+--- gcc/testsuite/gcc.target/i386/aeskeygenassist.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aeskeygenassist.c (revision 133902)
+@@ -0,0 +1,66 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++#define IMM8 1
++
++static __m128i src1[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set
++ of input/output vectors). */
++
++static void
++init_data (__m128i *s1, __m128i *d)
++{
++ int i;
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x16157e2b, 0xa6d2ae28,
++ 0x8815f7ab, 0x3c4fcf09);
++ d[i] = _mm_setr_epi32 (0x24b5e434, 0x3424b5e5,
++ 0xeb848a01, 0x01eb848b);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aeskeygenassist_si128 (src1[i], IMM8);
++ resdst[i + 1] = _mm_aeskeygenassist_si128 (src1[i + 1], IMM8);
++ resdst[i + 2] = _mm_aeskeygenassist_si128 (src1[i + 2], IMM8);
++ resdst[i + 3] = _mm_aeskeygenassist_si128 (src1[i + 3], IMM8);
++ resdst[i + 4] = _mm_aeskeygenassist_si128 (src1[i + 4], IMM8);
++ resdst[i + 5] = _mm_aeskeygenassist_si128 (src1[i + 5], IMM8);
++ resdst[i + 6] = _mm_aeskeygenassist_si128 (src1[i + 6], IMM8);
++ resdst[i + 7] = _mm_aeskeygenassist_si128 (src1[i + 7], IMM8);
++ resdst[i + 8] = _mm_aeskeygenassist_si128 (src1[i + 8], IMM8);
++ resdst[i + 9] = _mm_aeskeygenassist_si128 (src1[i + 9], IMM8);
++ resdst[i + 10] = _mm_aeskeygenassist_si128 (src1[i + 10], IMM8);
++ resdst[i + 11] = _mm_aeskeygenassist_si128 (src1[i + 11], IMM8);
++ resdst[i + 12] = _mm_aeskeygenassist_si128 (src1[i + 12], IMM8);
++ resdst[i + 13] = _mm_aeskeygenassist_si128 (src1[i + 13], IMM8);
++ resdst[i + 14] = _mm_aeskeygenassist_si128 (src1[i + 14], IMM8);
++ resdst[i + 15] = _mm_aeskeygenassist_si128 (src1[i + 15], IMM8);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp(edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/gcc.target/i386/aesenclast.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aesenclast.c (revision 133902)
+@@ -0,0 +1,68 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i src1[NUM];
++static __m128i src2[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one
++ set of input/output vectors). */
++
++static void
++init_data (__m128i *s1, __m128i *s2, __m128i *d)
++{
++ int i;
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x5d53475d, 0x63746f72,
++ 0x73745665, 0x7b5b5465);
++ s2[i] = _mm_setr_epi32 (0x726f6e5d, 0x5b477565,
++ 0x68617929, 0x48692853);
++ d[i] = _mm_setr_epi32 (0x53fdc611, 0x177ec425,
++ 0x938c5964, 0xc7fb881e);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, src2, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aesenclast_si128 (src1[i], src2[i]);
++ resdst[i + 1] = _mm_aesenclast_si128 (src1[i + 1], src2[i + 1]);
++ resdst[i + 2] = _mm_aesenclast_si128 (src1[i + 2], src2[i + 2]);
++ resdst[i + 3] = _mm_aesenclast_si128 (src1[i + 3], src2[i + 3]);
++ resdst[i + 4] = _mm_aesenclast_si128 (src1[i + 4], src2[i + 4]);
++ resdst[i + 5] = _mm_aesenclast_si128 (src1[i + 5], src2[i + 5]);
++ resdst[i + 6] = _mm_aesenclast_si128 (src1[i + 6], src2[i + 6]);
++ resdst[i + 7] = _mm_aesenclast_si128 (src1[i + 7], src2[i + 7]);
++ resdst[i + 8] = _mm_aesenclast_si128 (src1[i + 8], src2[i + 8]);
++ resdst[i + 9] = _mm_aesenclast_si128 (src1[i + 9], src2[i + 9]);
++ resdst[i + 10] = _mm_aesenclast_si128 (src1[i + 10], src2[i + 10]);
++ resdst[i + 11] = _mm_aesenclast_si128 (src1[i + 11], src2[i + 11]);
++ resdst[i + 12] = _mm_aesenclast_si128 (src1[i + 12], src2[i + 12]);
++ resdst[i + 13] = _mm_aesenclast_si128 (src1[i + 13], src2[i + 13]);
++ resdst[i + 14] = _mm_aesenclast_si128 (src1[i + 14], src2[i + 14]);
++ resdst[i + 15] = _mm_aesenclast_si128 (src1[i + 15], src2[i + 15]);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp(edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/gcc.target/i386/aesimc.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aesimc.c (revision 133902)
+@@ -0,0 +1,66 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i src1[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set
++ of input/output vectors). */
++
++static void
++init_data (__m128i *s1, __m128i *d)
++{
++ int i;
++
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x5d53475d, 0x63746f72,
++ 0x73745665, 0x7b5b5465);
++ d[i] = _mm_setr_epi32 (0x81c3b3e5, 0x2b18330a,
++ 0x44b109c8, 0x627a6f66);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aesimc_si128 (src1[i]);
++ resdst[i + 1] = _mm_aesimc_si128 (src1[i + 1]);
++ resdst[i + 2] = _mm_aesimc_si128 (src1[i + 2]);
++ resdst[i + 3] = _mm_aesimc_si128 (src1[i + 3]);
++ resdst[i + 4] = _mm_aesimc_si128 (src1[i + 4]);
++ resdst[i + 5] = _mm_aesimc_si128 (src1[i + 5]);
++ resdst[i + 6] = _mm_aesimc_si128 (src1[i + 6]);
++ resdst[i + 7] = _mm_aesimc_si128 (src1[i + 7]);
++ resdst[i + 8] = _mm_aesimc_si128 (src1[i + 8]);
++ resdst[i + 9] = _mm_aesimc_si128 (src1[i + 9]);
++ resdst[i + 10] = _mm_aesimc_si128 (src1[i + 10]);
++ resdst[i + 11] = _mm_aesimc_si128 (src1[i + 11]);
++ resdst[i + 12] = _mm_aesimc_si128 (src1[i + 12]);
++ resdst[i + 13] = _mm_aesimc_si128 (src1[i + 13]);
++ resdst[i + 14] = _mm_aesimc_si128 (src1[i + 14]);
++ resdst[i + 15] = _mm_aesimc_si128 (src1[i + 15]);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp(edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/gcc.target/i386/aesenc.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aesenc.c (revision 133902)
+@@ -0,0 +1,68 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i src1[NUM];
++static __m128i src2[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set
++ of input/output vectors). */
++
++static void
++init_data (__m128i *s1, __m128i *s2, __m128i *d)
++{
++ int i;
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x5d53475d, 0x63746f72,
++ 0x73745665, 0x7b5b5465);
++ s2[i] = _mm_setr_epi32 (0x726f6e5d, 0x5b477565,
++ 0x68617929, 0x48692853);
++ d[i] = _mm_setr_epi32 (0xded7e595, 0x8b104b58,
++ 0x9fdba3c5, 0xa8311c2f);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, src2, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aesenc_si128 (src1[i], src2[i]);
++ resdst[i + 1] = _mm_aesenc_si128 (src1[i + 1], src2[i + 1]);
++ resdst[i + 2] = _mm_aesenc_si128 (src1[i + 2], src2[i + 2]);
++ resdst[i + 3] = _mm_aesenc_si128 (src1[i + 3], src2[i + 3]);
++ resdst[i + 4] = _mm_aesenc_si128 (src1[i + 4], src2[i + 4]);
++ resdst[i + 5] = _mm_aesenc_si128 (src1[i + 5], src2[i + 5]);
++ resdst[i + 6] = _mm_aesenc_si128 (src1[i + 6], src2[i + 6]);
++ resdst[i + 7] = _mm_aesenc_si128 (src1[i + 7], src2[i + 7]);
++ resdst[i + 8] = _mm_aesenc_si128 (src1[i + 8], src2[i + 8]);
++ resdst[i + 9] = _mm_aesenc_si128 (src1[i + 9], src2[i + 9]);
++ resdst[i + 10] = _mm_aesenc_si128 (src1[i + 10], src2[i + 10]);
++ resdst[i + 11] = _mm_aesenc_si128 (src1[i + 11], src2[i + 11]);
++ resdst[i + 12] = _mm_aesenc_si128 (src1[i + 12], src2[i + 12]);
++ resdst[i + 13] = _mm_aesenc_si128 (src1[i + 13], src2[i + 13]);
++ resdst[i + 14] = _mm_aesenc_si128 (src1[i + 14], src2[i + 14]);
++ resdst[i + 15] = _mm_aesenc_si128 (src1[i + 15], src2[i + 15]);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp (edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/gcc.target/i386/sse-13.c (revision 133901)
++++ gcc/testsuite/gcc.target/i386/sse-13.c (revision 133902)
+@@ -1,8 +1,8 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -march=k8 -m3dnow -msse4 -msse5" } */
++/* { dg-options "-O2 -march=k8 -m3dnow -msse4 -msse5 -maes -mpclmul" } */
+
+ /* Test that the intrinsics compile with optimization. All of them are
+- defined as inline functions in {,x,e,p,t,s,a,b}mmintrin.h and mm3dnow.h
++ defined as inline functions in {,x,e,p,t,s,w,a,b}mmintrin.h and mm3dnow.h
+ that reference the proper builtin functions. Defining away "extern" and
+ "__inline" results in all of them being compiled as proper functions. */
+
+@@ -15,6 +15,10 @@
+ #define __builtin_ia32_extrqi(X, I, L) __builtin_ia32_extrqi(X, 1, 1)
+ #define __builtin_ia32_insertqi(X, Y, I, L) __builtin_ia32_insertqi(X, Y, 1, 1)
+
++/* wmmintrin.h */
++#define __builtin_ia32_aeskeygenassist128(X, C) __builtin_ia32_aeskeygenassist128(X, 1)
++#define __builtin_ia32_pclmulqdq128(X, Y, I) __builtin_ia32_pclmulqdq128(X, Y, 1)
++
+ /* smmintrin.h */
+ #define __builtin_ia32_pblendw128(X, Y, M) __builtin_ia32_pblendw128 (X, Y, 1)
+ #define __builtin_ia32_blendps(X, Y, M) __builtin_ia32_blendps(X, Y, 1)
+@@ -92,6 +96,7 @@
+ #define __builtin_ia32_protdi(A, B) __builtin_ia32_protdi(A,1)
+ #define __builtin_ia32_protqi(A, B) __builtin_ia32_protqi(A,1)
+
++#include <wmmintrin.h>
+ #include <bmmintrin.h>
+ #include <smmintrin.h>
+ #include <mm3dnow.h>
+--- gcc/testsuite/gcc.target/i386/aesdec.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/aesdec.c (revision 133902)
+@@ -0,0 +1,67 @@
++/* { dg-do run } */
++/* { dg-require-effective-target aes } */
++/* { dg-options "-O2 -maes" } */
++
++#include <wmmintrin.h>
++#include <string.h>
++
++#include "aes-check.h"
++
++extern void abort (void);
++
++#define NUM 1024
++
++static __m128i src1[NUM];
++static __m128i src2[NUM];
++static __m128i edst[NUM];
++
++static __m128i resdst[NUM];
++
++/* Initialize input/output vectors. (Currently, there is only one set
++ of input/output vectors). */
++static void
++init_data (__m128i *s1, __m128i *s2, __m128i *d)
++{
++ int i;
++ for (i = 0; i < NUM; i++)
++ {
++ s1[i] = _mm_setr_epi32 (0x5d53475d, 0x63746f72,
++ 0x73745665, 0x7b5b5465);
++ s2[i] = _mm_setr_epi32 (0x726f6e5d, 0x5b477565,
++ 0x68617929, 0x48692853);
++ d[i] = _mm_setr_epi32 (0xb730392a, 0xb58eb95e,
++ 0xfaea2787, 0x138ac342);
++ }
++}
++
++static void
++aes_test (void)
++{
++ int i;
++
++ init_data (src1, src2, edst);
++
++ for (i = 0; i < NUM; i += 16)
++ {
++ resdst[i] = _mm_aesdec_si128 (src1[i], src2[i]);
++ resdst[i + 1] = _mm_aesdec_si128 (src1[i + 1], src2[i + 1]);
++ resdst[i + 2] = _mm_aesdec_si128 (src1[i + 2], src2[i + 2]);
++ resdst[i + 3] = _mm_aesdec_si128 (src1[i + 3], src2[i + 3]);
++ resdst[i + 4] = _mm_aesdec_si128 (src1[i + 4], src2[i + 4]);
++ resdst[i + 5] = _mm_aesdec_si128 (src1[i + 5], src2[i + 5]);
++ resdst[i + 6] = _mm_aesdec_si128 (src1[i + 6], src2[i + 6]);
++ resdst[i + 7] = _mm_aesdec_si128 (src1[i + 7], src2[i + 7]);
++ resdst[i + 8] = _mm_aesdec_si128 (src1[i + 8], src2[i + 8]);
++ resdst[i + 9] = _mm_aesdec_si128 (src1[i + 9], src2[i + 9]);
++ resdst[i + 10] = _mm_aesdec_si128 (src1[i + 10], src2[i + 10]);
++ resdst[i + 11] = _mm_aesdec_si128 (src1[i + 11], src2[i + 11]);
++ resdst[i + 12] = _mm_aesdec_si128 (src1[i + 12], src2[i + 12]);
++ resdst[i + 13] = _mm_aesdec_si128 (src1[i + 13], src2[i + 13]);
++ resdst[i + 14] = _mm_aesdec_si128 (src1[i + 14], src2[i + 14]);
++ resdst[i + 15] = _mm_aesdec_si128 (src1[i + 15], src2[i + 15]);
++ }
++
++ for (i = 0; i < NUM; i++)
++ if (memcmp (edst + i, resdst + i, sizeof (__m128i)))
++ abort ();
++}
+--- gcc/testsuite/g++.dg/other/i386-2.C (revision 133901)
++++ gcc/testsuite/g++.dg/other/i386-2.C (revision 133902)
+@@ -1,8 +1,9 @@
+-/* Test that {,x,e,p,t,s,a,b}mmintrin.h, mm3dnow.h and mm_malloc.h are
++/* Test that {,x,e,p,t,s,w,a,b}mmintrin.h, mm3dnow.h and mm_malloc.h are
+ usable with -O -pedantic-errors. */
+ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+-/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -msse4 -msse5" } */
++/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -msse4 -msse5 -maes -mpclmul" } */
+
++#include <wmmintrin.h>
+ #include <bmmintrin.h>
+ #include <smmintrin.h>
+ #include <mm3dnow.h>
+--- gcc/testsuite/g++.dg/other/i386-3.C (revision 133901)
++++ gcc/testsuite/g++.dg/other/i386-3.C (revision 133902)
+@@ -1,8 +1,9 @@
+-/* Test that {,x,e,p,t,s,a,b}mmintrin.h, mm3dnow.h and mm_malloc.h are
++/* Test that {,x,e,p,t,s,w,a,b}mmintrin.h, mm3dnow.h and mm_malloc.h are
+ usable with -O -fkeep-inline-functions. */
+ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+-/* { dg-options "-O -fkeep-inline-functions -march=k8 -m3dnow -msse4 -msse5" } */
++/* { dg-options "-O -fkeep-inline-functions -march=k8 -m3dnow -maes -mpclmul -msse4 -msse5" } */
+
++#include <wmmintrin.h>
+ #include <bmmintrin.h>
+ #include <smmintrin.h>
+ #include <mm3dnow.h>
diff --git a/gcc43-pr29609.patch b/gcc43-pr29609.patch
new file mode 100644
index 0000000..1a8dfbf
--- /dev/null
+++ b/gcc43-pr29609.patch
@@ -0,0 +1,899 @@
+2008-10-08 Jakub Jelinek <jakub@redhat.com>
+
+ * cfgexpand.c (expand_gimple_cond_expr): Convert also goto_block and
+ goto_locus of true_edge into RTL locator.
+
+2008-10-07 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/29609
+ PR debug/36690
+ PR debug/37616
+ * basic-block.h (struct edge_def): Add goto_block field.
+ * cfglayout.c (fixup_reorder_chain): Ensure that there is at least
+ one insn with locus corresponding to edge's goto_locus if !optimize.
+ * profile.c (branch_prob): Copy edge's goto_block.
+ * cfgrtl.c (force_nonfallthru_and_redirect): Use goto_locus for
+ emitted jumps.
+ (cfg_layout_merge_blocks): Emit a nop with edge's goto_locus
+ locator in between the merged basic blocks if !optimize and needed.
+ * cfgexpand.c (expand_gimple_cond_expr): Convert goto_block and
+ goto_locus into RTL locator. For unconditional jump use that
+ locator for the jump insn.
+ (expand_gimple_basic_block): Convert goto_block and goto_locus into
+ RTL locator for all remaining edges. For unconditional jump
+ use that locator for the jump insn.
+ * cfgcleanup.c (try_forward_edges): Avoid the optimization if
+ there is more than one edge or insn locator along the forwarding
+ edges and !optimize. If there is just one, set e->goto_locus.
+ * tree-cfg.c (make_cond_expr_edges, make_goto_expr_edges): Set also
+ edge's goto_block.
+ (move_block_to_fn): Adjust edge's goto_block.
+
+ * gcc.dg/debug/pr29609-1.c: New test.
+ * gcc.dg/debug/pr29609-2.c: New test.
+ * gcc.dg/debug/pr36690-1.c: New test.
+ * gcc.dg/debug/pr36690-2.c: New test.
+ * gcc.dg/debug/pr36690-3.c: New test.
+ * gcc.dg/debug/pr37616.c: New test.
+ * gcc.dg/debug/dwarf2/pr29609-1.c: New test.
+ * gcc.dg/debug/dwarf2/pr29609-2.c: New test.
+ * gcc.dg/debug/dwarf2/pr36690-1.c: New test.
+ * gcc.dg/debug/dwarf2/pr36690-2.c: New test.
+ * gcc.dg/debug/dwarf2/pr36690-3.c: New test.
+ * gcc.dg/debug/dwarf2/pr37616.c: New test.
+
+--- gcc/profile.c (revision 140947)
++++ gcc/profile.c (revision 140948)
+@@ -825,7 +825,9 @@ branch_prob (void)
+ #endif
+ {
+ basic_block new = split_edge (e);
+- single_succ_edge (new)->goto_locus = e->goto_locus;
++ edge ne = single_succ_edge (new);
++ ne->goto_locus = e->goto_locus;
++ ne->goto_block = e->goto_block;
+ }
+ if ((e->flags & (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL))
+ && e->dest != EXIT_BLOCK_PTR)
+--- gcc/cfgexpand.c (revision 140947)
++++ gcc/cfgexpand.c (revision 140948)
+@@ -1316,7 +1316,12 @@ expand_gimple_cond_expr (basic_block bb,
+ add_reg_br_prob_note (last, true_edge->probability);
+ maybe_dump_rtl_for_tree_stmt (stmt, last);
+ if (true_edge->goto_locus)
+- set_curr_insn_source_location (location_from_locus (true_edge->goto_locus));
++ {
++ set_curr_insn_source_location (location_from_locus (true_edge->goto_locus));
++ set_curr_insn_block (true_edge->goto_block);
++ true_edge->goto_locus = curr_insn_locator ();
++ }
++ true_edge->goto_block = NULL;
+ false_edge->flags |= EDGE_FALLTHRU;
+ return NULL;
+ }
+@@ -1326,7 +1331,12 @@ expand_gimple_cond_expr (basic_block bb,
+ add_reg_br_prob_note (last, false_edge->probability);
+ maybe_dump_rtl_for_tree_stmt (stmt, last);
+ if (false_edge->goto_locus)
+- set_curr_insn_source_location (location_from_locus (false_edge->goto_locus));
++ {
++ set_curr_insn_source_location (location_from_locus (false_edge->goto_locus));
++ set_curr_insn_block (false_edge->goto_block);
++ false_edge->goto_locus = curr_insn_locator ();
++ }
++ false_edge->goto_block = NULL;
+ true_edge->flags |= EDGE_FALLTHRU;
+ return NULL;
+ }
+@@ -1334,6 +1344,13 @@ expand_gimple_cond_expr (basic_block bb,
+ jumpif (pred, label_rtx_for_bb (true_edge->dest));
+ add_reg_br_prob_note (last, true_edge->probability);
+ last = get_last_insn ();
++ if (false_edge->goto_locus)
++ {
++ set_curr_insn_source_location (location_from_locus (false_edge->goto_locus));
++ set_curr_insn_block (false_edge->goto_block);
++ false_edge->goto_locus = curr_insn_locator ();
++ }
++ false_edge->goto_block = NULL;
+ emit_jump (label_rtx_for_bb (false_edge->dest));
+
+ BB_END (bb) = last;
+@@ -1356,9 +1373,13 @@ expand_gimple_cond_expr (basic_block bb,
+
+ maybe_dump_rtl_for_tree_stmt (stmt, last2);
+
+- if (false_edge->goto_locus)
+- set_curr_insn_source_location (location_from_locus (false_edge->goto_locus));
+-
++ if (true_edge->goto_locus)
++ {
++ set_curr_insn_source_location (location_from_locus (true_edge->goto_locus));
++ set_curr_insn_block (true_edge->goto_block);
++ true_edge->goto_locus = curr_insn_locator ();
++ }
++ true_edge->goto_block = NULL;
+ return new_bb;
+ }
+
+@@ -1613,19 +1634,21 @@ expand_gimple_basic_block (basic_block b
+ }
+ }
+
+- /* Expand implicit goto. */
++ /* Expand implicit goto and convert goto_locus. */
+ FOR_EACH_EDGE (e, ei, bb->succs)
+ {
+- if (e->flags & EDGE_FALLTHRU)
+- break;
+- }
+-
+- if (e && e->dest != bb->next_bb)
+- {
+- emit_jump (label_rtx_for_bb (e->dest));
+- if (e->goto_locus)
+- set_curr_insn_source_location (location_from_locus (e->goto_locus));
+- e->flags &= ~EDGE_FALLTHRU;
++ if (e->goto_locus && e->goto_block)
++ {
++ set_curr_insn_source_location (location_from_locus (e->goto_locus));
++ set_curr_insn_block (e->goto_block);
++ e->goto_locus = curr_insn_locator ();
++ }
++ e->goto_block = NULL;
++ if ((e->flags & EDGE_FALLTHRU) && e->dest != bb->next_bb)
++ {
++ emit_jump (label_rtx_for_bb (e->dest));
++ e->flags &= ~EDGE_FALLTHRU;
++ }
+ }
+
+ do_pending_stack_adjust ();
+--- gcc/cfgcleanup.c (revision 140947)
++++ gcc/cfgcleanup.c (revision 140948)
+@@ -429,7 +429,7 @@ try_forward_edges (int mode, basic_block
+ for (ei = ei_start (b->succs); (e = ei_safe_edge (ei)); )
+ {
+ basic_block target, first;
+- int counter;
++ int counter, goto_locus;
+ bool threaded = false;
+ int nthreaded_edges = 0;
+ bool may_thread = first_pass | df_get_bb_dirty (b);
+@@ -447,6 +447,7 @@ try_forward_edges (int mode, basic_block
+
+ target = first = e->dest;
+ counter = NUM_FIXED_BLOCKS;
++ goto_locus = e->goto_locus;
+
+ /* If we are partitioning hot/cold basic_blocks, we don't want to mess
+ up jumps that cross between hot/cold sections.
+@@ -476,6 +477,27 @@ try_forward_edges (int mode, basic_block
+ new_target = single_succ (target);
+ if (target == new_target)
+ counter = n_basic_blocks;
++ else if (!optimize)
++ {
++ /* When not optimizing, ensure that edges or forwarder
++ blocks with different locus are not optimized out. */
++ int locus = single_succ_edge (target)->goto_locus;
++
++ if (locus && goto_locus && locus != goto_locus)
++ counter = n_basic_blocks;
++ else if (locus)
++ goto_locus = locus;
++
++ if (INSN_P (BB_END (target)))
++ {
++ locus = INSN_LOCATOR (BB_END (target));
++
++ if (locus && goto_locus && locus != goto_locus)
++ counter = n_basic_blocks;
++ else if (locus)
++ goto_locus = locus;
++ }
++ }
+ }
+
+ /* Allow to thread only over one edge at time to simplify updating
+@@ -539,6 +561,8 @@ try_forward_edges (int mode, basic_block
+ int edge_frequency;
+ int n = 0;
+
++ e->goto_locus = goto_locus;
++
+ /* Don't force if target is exit block. */
+ if (threaded && target != EXIT_BLOCK_PTR)
+ {
+--- gcc/cfglayout.c (revision 140947)
++++ gcc/cfglayout.c (revision 140948)
+@@ -887,6 +887,46 @@ fixup_reorder_chain (void)
+ if (e && !can_fallthru (e->src, e->dest))
+ force_nonfallthru (e);
+ }
++
++ /* Ensure goto_locus from edges has some instructions with that locus
++ in RTL. */
++ if (!optimize)
++ FOR_EACH_BB (bb)
++ {
++ edge e;
++ edge_iterator ei;
++
++ FOR_EACH_EDGE (e, ei, bb->succs)
++ if (e->goto_locus && !(e->flags & EDGE_ABNORMAL))
++ {
++ basic_block nb;
++
++ if (simplejump_p (BB_END (e->src)))
++ {
++ if (INSN_LOCATOR (BB_END (e->src)) == (int) e->goto_locus)
++ continue;
++ if (INSN_LOCATOR (BB_END (e->src)) == 0)
++ {
++ INSN_LOCATOR (BB_END (e->src)) = e->goto_locus;
++ continue;
++ }
++ }
++ if (e->dest != EXIT_BLOCK_PTR)
++ {
++ insn = BB_HEAD (e->dest);
++ if (!INSN_P (insn))
++ insn = next_insn (insn);
++ if (insn && INSN_P (insn)
++ && INSN_LOCATOR (insn) == (int) e->goto_locus)
++ continue;
++ }
++ nb = split_edge (e);
++ if (!INSN_P (BB_END (nb)))
++ BB_END (nb) = emit_insn_after_noloc (gen_nop (), BB_END (nb),
++ nb);
++ INSN_LOCATOR (BB_END (nb)) = e->goto_locus;
++ }
++ }
+ }
+ \f
+ /* Perform sanity checks on the insn chain.
+--- gcc/basic-block.h (revision 140947)
++++ gcc/basic-block.h (revision 140948)
+@@ -129,7 +129,8 @@ struct edge_def GTY(())
+ /* Auxiliary info specific to a pass. */
+ PTR GTY ((skip (""))) aux;
+
+- /* Location of any goto implicit in the edge, during tree-ssa. */
++ /* Location of any goto implicit in the edge and associated BLOCK. */
++ tree goto_block;
+ source_locus goto_locus;
+
+ /* The index number corresponding to this edge in the edge vector
+--- gcc/tree-cfg.c (revision 140947)
++++ gcc/tree-cfg.c (revision 140948)
+@@ -634,6 +634,7 @@ make_cond_expr_edges (basic_block bb)
+ #else
+ e->goto_locus = EXPR_LOCUS (COND_EXPR_THEN (entry));
+ #endif
++ e->goto_block = TREE_BLOCK (COND_EXPR_THEN (entry));
+ e = make_edge (bb, else_bb, EDGE_FALSE_VALUE);
+ if (e)
+ {
+@@ -642,6 +643,7 @@ make_cond_expr_edges (basic_block bb)
+ #else
+ e->goto_locus = EXPR_LOCUS (COND_EXPR_ELSE (entry));
+ #endif
++ e->goto_block = TREE_BLOCK (COND_EXPR_ELSE (entry));
+ }
+
+ /* We do not need the gotos anymore. */
+@@ -841,6 +843,7 @@ make_goto_expr_edges (basic_block bb)
+ #else
+ e->goto_locus = EXPR_LOCUS (goto_t);
+ #endif
++ e->goto_block = TREE_BLOCK (goto_t);
+ bsi_remove (&last, true);
+ return;
+ }
+@@ -5874,6 +5877,23 @@ move_block_to_fn (struct function *dest_
+ update_stmt (stmt);
+ pop_cfun ();
+ }
++
++ FOR_EACH_EDGE (e, ei, bb->succs)
++ if (e->goto_locus)
++ {
++ tree block = e->goto_block;
++ if (d->orig_block == NULL_TREE
++ || block == d->orig_block)
++ e->goto_block = d->new_block;
++#ifdef ENABLE_CHECKING
++ else if (block != d->new_block)
++ {
++ while (block && block != d->orig_block)
++ block = BLOCK_SUPERCONTEXT (block);
++ gcc_assert (block);
++ }
++#endif
++ }
+ }
+
+ /* Examine the statements in BB (which is in SRC_CFUN); find and return
+--- gcc/cfgrtl.c (revision 140947)
++++ gcc/cfgrtl.c (revision 140948)
+@@ -1009,6 +1009,7 @@ force_nonfallthru_and_redirect (edge e,
+ rtx note;
+ edge new_edge;
+ int abnormal_edge_flags = 0;
++ int loc;
+
+ /* In the case the last instruction is conditional jump to the next
+ instruction, first redirect the jump itself and then continue
+@@ -1127,11 +1128,15 @@ force_nonfallthru_and_redirect (edge e,
+ else
+ jump_block = e->src;
+
++ if (e->goto_locus && e->goto_block == NULL)
++ loc = e->goto_locus;
++ else
++ loc = 0;
+ e->flags &= ~EDGE_FALLTHRU;
+ if (target == EXIT_BLOCK_PTR)
+ {
+ #ifdef HAVE_return
+- emit_jump_insn_after_noloc (gen_return (), BB_END (jump_block));
++ emit_jump_insn_after_setloc (gen_return (), BB_END (jump_block), loc);
+ #else
+ gcc_unreachable ();
+ #endif
+@@ -1139,7 +1144,7 @@ force_nonfallthru_and_redirect (edge e,
+ else
+ {
+ rtx label = block_label (target);
+- emit_jump_insn_after_noloc (gen_jump (label), BB_END (jump_block));
++ emit_jump_insn_after_setloc (gen_jump (label), BB_END (jump_block), loc);
+ JUMP_LABEL (BB_END (jump_block)) = label;
+ LABEL_NUSES (label)++;
+ }
+@@ -2606,6 +2611,32 @@ cfg_layout_merge_blocks (basic_block a,
+ try_redirect_by_replacing_jump (EDGE_SUCC (a, 0), b, true);
+ gcc_assert (!JUMP_P (BB_END (a)));
+
++ /* When not optimizing and the edge is the only place in RTL which holds
++ some unique locus, emit a nop with that locus in between. */
++ if (!optimize && EDGE_SUCC (a, 0)->goto_locus)
++ {
++ rtx insn = BB_END (a);
++ int goto_locus = EDGE_SUCC (a, 0)->goto_locus;
++
++ if (NOTE_P (insn))
++ insn = prev_nonnote_insn (insn);
++ if (insn && INSN_P (insn) && INSN_LOCATOR (insn) == goto_locus)
++ goto_locus = 0;
++ else
++ {
++ insn = BB_HEAD (b);
++ if (!INSN_P (insn))
++ insn = next_insn (insn);
++ if (insn && INSN_P (insn) && INSN_LOCATOR (insn) == goto_locus)
++ goto_locus = 0;
++ }
++ if (goto_locus)
++ {
++ BB_END (a) = emit_insn_after_noloc (gen_nop (), BB_END (a), a);
++ INSN_LOCATOR (BB_END (a)) = goto_locus;
++ }
++ }
++
+ /* Possible line number notes should appear in between. */
+ if (b->il.rtl->header)
+ {
+--- gcc/testsuite/gcc.dg/debug/pr36690-1.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr36690-1.c (revision 140948)
+@@ -0,0 +1,23 @@
++/* PR debug/36690 */
++/* Verify that break func is hit.
++ This version of the test just checks that it can be compiled, linked
++ and executed, further testing is done in corresponding gcc.dg/dwarf2/
++ test and hopefully in gdb testsuite. */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++int i;
++
++void
++func (void)
++{
++ while (i == 1)
++ i = 0;
++}
++
++int
++main (void)
++{
++ func ();
++ return 0;
++}
+--- gcc/testsuite/gcc.dg/debug/pr36690-2.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr36690-2.c (revision 140948)
+@@ -0,0 +1,40 @@
++/* PR debug/36690 */
++/* Verify that breakpoint can be put on goto f1, it is hit and
++ varz at that spot is defined and contains 5. Nowhere else
++ in the function should be varz in the scope.
++ This version of the test just checks that it can be compiled, linked
++ and executed, further testing is done in corresponding gcc.dg/dwarf2/
++ test and hopefully in gdb testsuite. */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++int cnt;
++
++void
++bar (int i)
++{
++ cnt += i;
++}
++
++void
++foo (int i)
++{
++ if (!i)
++ bar (0);
++ else
++ {
++ static int varz = 5;
++ goto f1;
++ }
++ bar (1);
++f1:
++ bar (2);
++}
++
++int
++main (void)
++{
++ foo (0);
++ foo (1);
++ return 0;
++}
+--- gcc/testsuite/gcc.dg/debug/pr29609-1.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr29609-1.c (revision 140948)
+@@ -0,0 +1,33 @@
++/* PR debug/29609 */
++/* Verify that breakpoint on the break is hit.
++ This version of the test just checks that it can be compiled, linked
++ and executed, further testing is done in corresponding gcc.dg/dwarf2/
++ test and hopefully in gdb testsuite. */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++extern void abort (void);
++
++int
++foo (void)
++{
++ int a, i;
++
++ for (i = 1; i <= 10; i++)
++ {
++ if (i < 3)
++ a = 1;
++ else
++ break;
++ a = 5;
++ }
++ return a;
++}
++
++int
++main (void)
++{
++ if (foo () != 5)
++ abort ();
++ return 0;
++}
+--- gcc/testsuite/gcc.dg/debug/pr36690-3.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr36690-3.c (revision 140948)
+@@ -0,0 +1,47 @@
++/* PR debug/36690 */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++int cnt;
++
++void
++bar (int i)
++{
++ cnt += i;
++}
++
++void
++foo (int i, int j)
++{
++ if (j)
++ {
++ bar (i + 1);
++ goto f1;
++ }
++ bar (i + 2);
++ goto f2;
++f1:
++ if (i > 10)
++ goto f3;
++f2:
++ if (i > 40)
++ goto f4;
++ else
++ goto f5;
++f3:
++ bar (i);
++f4:
++ bar (i);
++f5:
++ bar (i);
++}
++
++int
++main (void)
++{
++ foo (0, 1);
++ foo (11, 1);
++ foo (21, 0);
++ foo (41, 0);
++ return 0;
++}
+--- gcc/testsuite/gcc.dg/debug/pr29609-2.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr29609-2.c (revision 140948)
+@@ -0,0 +1,53 @@
++/* PR debug/29609 */
++/* Verify that breakpoint on both goto failure; stmts is hit.
++ This version of the test just checks that it can be compiled, linked
++ and executed, further testing is done in corresponding gcc.dg/dwarf2/
++ test and hopefully in gdb testsuite. */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++extern void abort (void);
++int x;
++
++int
++foo (void)
++{
++ return 0 ^ x;
++}
++
++int
++bar (void)
++{
++ return 1 ^ x;
++}
++
++int
++baz (void)
++{
++ int c;
++
++ if (!foo ())
++ goto failure;
++
++ if (!bar ())
++ goto failure;
++
++ return 0;
++
++failure:
++ return 1;
++}
++
++int
++main (void)
++{
++ if (baz () != 1)
++ abort ();
++ x = 1;
++ if (baz () != 1)
++ abort ();
++ x = 2;
++ if (baz () != 0)
++ abort ();
++ return 0;
++}
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c (revision 140948)
+@@ -0,0 +1,22 @@
++/* PR debug/36690 */
++/* Verify that break func is hit. */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++int i;
++
++void
++func (void)
++{
++ while (i == 1)
++ i = 0;
++}
++
++int
++main (void)
++{
++ func ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr36690-1.c:11" } } */
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c (revision 140948)
+@@ -0,0 +1,39 @@
++/* PR debug/36690 */
++/* Verify that breakpoint can be put on goto f1, it is hit and
++ varz at that spot is defined and contains 5. Nowhere else
++ in the function should be varz in the scope. */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++int cnt;
++
++void
++bar (int i)
++{
++ cnt += i;
++}
++
++void
++foo (int i)
++{
++ if (!i)
++ bar (0);
++ else
++ {
++ static int varz = 5;
++ goto f1;
++ }
++ bar (1);
++f1:
++ bar (2);
++}
++
++int
++main (void)
++{
++ foo (0);
++ foo (1);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr36690-2.c:24" } } */
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c (revision 140948)
+@@ -0,0 +1,32 @@
++/* PR debug/29609 */
++/* Verify that breakpoint on the break is hit. */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++void abort (void);
++
++int
++foo (void)
++{
++ int a, i;
++
++ for (i = 1; i <= 10; i++)
++ {
++ if (i < 3)
++ a = 1;
++ else
++ break;
++ a = 5;
++ }
++ return a;
++}
++
++int
++main (void)
++{
++ if (foo () != 5)
++ abort ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr29609-1.c:18" } } */
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c (revision 140948)
+@@ -0,0 +1,53 @@
++/* PR debug/36690 */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++int cnt;
++
++void
++bar (int i)
++{
++ cnt += i;
++}
++
++void
++foo (int i, int j)
++{
++ if (j)
++ {
++ bar (i + 1);
++ goto f1;
++ }
++ bar (i + 2);
++ goto f2;
++f1:
++ if (i > 10)
++ goto f3;
++f2:
++ if (i > 40)
++ goto f4;
++ else
++ goto f5;
++f3:
++ bar (i);
++f4:
++ bar (i);
++f5:
++ bar (i);
++}
++
++int
++main (void)
++{
++ foo (0, 1);
++ foo (11, 1);
++ foo (21, 0);
++ foo (41, 0);
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr36690-3.c:19" } } */
++/* { dg-final { scan-assembler "pr36690-3.c:22" } } */
++/* { dg-final { scan-assembler "pr36690-3.c:25" } } */
++/* { dg-final { scan-assembler "pr36690-3.c:28" } } */
++/* { dg-final { scan-assembler "pr36690-3.c:30" } } */
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c (revision 140948)
+@@ -0,0 +1,53 @@
++/* PR debug/29609 */
++/* Verify that breakpoint on both goto failure; stmts is hit. */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++extern void abort (void);
++int x;
++
++int
++foo (void)
++{
++ return 0 ^ x;
++}
++
++int
++bar (void)
++{
++ return 1 ^ x;
++}
++
++int
++baz (void)
++{
++ int c;
++
++ if (!foo ())
++ goto failure;
++
++ if (!bar ())
++ goto failure;
++
++ return 0;
++
++failure:
++ return 1;
++}
++
++int
++main (void)
++{
++ if (baz () != 1)
++ abort ();
++ x = 1;
++ if (baz () != 1)
++ abort ();
++ x = 2;
++ if (baz () != 0)
++ abort ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr29609-2.c:27" } } */
++/* { dg-final { scan-assembler "pr29609-2.c:30" } } */
+--- gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c (revision 140948)
+@@ -0,0 +1,41 @@
++/* PR debug/37616 */
++/* Test that one can put breakpoints onto continue, exitlab and break
++ and actually see program reaching those breakpoints. */
++/* { dg-do compile } */
++/* { dg-options "-O0 -gdwarf-2 -dA" } */
++
++extern void abort (void);
++
++int
++foo (int parm)
++{
++ int varj, varm;
++
++ for (varj = 0; varj < 10; varj++)
++ {
++ if (varj == 5)
++ continue;
++ if (varj == 7 && !parm)
++ goto exitlab;
++ if (varj == 9)
++ break;
++ varm = varj;
++ }
++
++exitlab:
++ return varm;
++}
++
++int
++main (void)
++{
++ if (foo (0) != 6)
++ abort ();
++ if (foo (1) != 8)
++ abort ();
++ return 0;
++}
++
++/* { dg-final { scan-assembler "pr37616.c:17" } } */
++/* { dg-final { scan-assembler "pr37616.c:19" } } */
++/* { dg-final { scan-assembler "pr37616.c:21" } } */
+--- gcc/testsuite/gcc.dg/debug/pr37616.c (revision 0)
++++ gcc/testsuite/gcc.dg/debug/pr37616.c (revision 140948)
+@@ -0,0 +1,40 @@
++/* PR debug/37616 */
++/* Test that one can put breakpoints onto continue, exitlab and break
++ and actually see program reaching those breakpoints.
++ This version of the test just checks that it can be compiled, linked
++ and executed, further testing is done in corresponding gcc.dg/dwarf2/
++ test and hopefully in gdb testsuite. */
++/* { dg-do run } */
++/* { dg-options "-O0 -g -dA" } */
++
++extern void abort (void);
++
++int
++foo (int parm)
++{
++ int varj, varm;
++
++ for (varj = 0; varj < 10; varj++)
++ {
++ if (varj == 5)
++ continue;
++ if (varj == 7 && !parm)
++ goto exitlab;
++ if (varj == 9)
++ break;
++ varm = varj;
++ }
++
++exitlab:
++ return varm;
++}
++
++int
++main (void)
++{
++ if (foo (0) != 6)
++ abort ();
++ if (foo (1) != 8)
++ abort ();
++ return 0;
++}
diff --git a/gcc43-pr37738.patch b/gcc43-pr37738.patch
new file mode 100644
index 0000000..90c3235
--- /dev/null
+++ b/gcc43-pr37738.patch
@@ -0,0 +1,276 @@
+2008-10-07 Jakub Jelinek <jakub@redhat.com>
+
+ * f95-lang.c (poplevel): Don't clear BLOCK_VARS if functionbody.
+ * trans-decl.c (gfc_build_qualified_array): Build accurate debug type
+ even if nest.
+ (build_entry_thunks, gfc_generate_function_code,
+ gfc_generate_constructors): Ensure DECL_SAVED_TREE is a BIND_EXPR
+ with DECL_INITIAL as its BLOCK.
+
+ PR debug/37738
+ * dwarf2out.c (common_block_die_table): New variable.
+ (common_block_die_table_hash, common_block_die_table_eq): New
+ functions.
+ (gen_variable_die): Look up a DW_TAG_common_block die for a particular
+ COMMON block in the current scope rather than globally. Optimize
+ DW_OP_addr SYMBOL_REF DW_OP_plus_uconst off into
+ DW_OP_addr SYMBOL_REF+off.
+
+ * gfortran.dg/debug/pr37738.f: New test.
+
+--- gcc/testsuite/gfortran.dg/debug/pr37738.f (revision 0)
++++ gcc/testsuite/gfortran.dg/debug/pr37738.f (revision 140945)
+@@ -0,0 +1,30 @@
++C PR debug/37738
++C { dg-do compile }
++C { dg-skip-if "DWARF-2 only" { "*-*-*" } { "*" } { "-gdwarf-2" } }
++C { dg-options "-dA" }
++
++ subroutine a
++ integer*4 a_i, c_i
++ common /block/a_i, c_i
++ a_i = 1
++ c_i = 4
++ end subroutine a
++ subroutine b
++ integer*4 b_i
++ common /block/b_i, d_i
++ b_i = 2
++ d_i = 5
++ end subroutine b
++ subroutine c
++ integer*4 a_i, c_i
++ common /block/a_i, c_i
++ if (a_i .ne. 2) call abort
++ if (c_i .ne. 5) call abort
++ end subroutine c
++ program abc
++ call a
++ call b
++ call c
++ end program abc
++
++C { dg-final { scan-assembler-times "DIE\[^\n\]*DW_TAG_common_block" 3 } }
+--- gcc/dwarf2out.c (revision 140943)
++++ gcc/dwarf2out.c (revision 140945)
+@@ -4748,6 +4748,10 @@ static GTY((param_is (struct dwarf_file_
+ The key is a DECL_UID() which is a unique number identifying each decl. */
+ static GTY ((param_is (struct die_struct))) htab_t decl_die_table;
+
++/* A hash table of references to DIE's that describe COMMON blocks.
++ The key is DECL_UID() ^ die_parent. */
++static GTY ((param_is (struct die_struct))) htab_t common_block_die_table;
++
+ /* Node of the variable location list. */
+ struct var_loc_node GTY ((chain_next ("%h.next")))
+ {
+@@ -4960,6 +4964,8 @@ static void equate_type_number_to_die (t
+ static hashval_t decl_die_table_hash (const void *);
+ static int decl_die_table_eq (const void *, const void *);
+ static dw_die_ref lookup_decl_die (tree);
++static hashval_t common_block_die_table_hash (const void *);
++static int common_block_die_table_eq (const void *, const void *);
+ static hashval_t decl_loc_table_hash (const void *);
+ static int decl_loc_table_eq (const void *, const void *);
+ static var_loc_list *lookup_decl_loc (const_tree);
+@@ -13812,6 +13818,26 @@ gen_subprogram_die (tree decl, dw_die_re
+
+ }
+
++/* Returns a hash value for X (which really is a die_struct). */
++
++static hashval_t
++common_block_die_table_hash (const void *x)
++{
++ const_dw_die_ref d = (const_dw_die_ref) x;
++ return (hashval_t) d->decl_id ^ htab_hash_pointer (d->die_parent);
++}
++
++/* Return nonzero if decl_id and die_parent of die_struct X is the same
++ as decl_id and die_parent of die_struct Y. */
++
++static int
++common_block_die_table_eq (const void *x, const void *y)
++{
++ const_dw_die_ref d = (const_dw_die_ref) x;
++ const_dw_die_ref e = (const_dw_die_ref) y;
++ return d->decl_id == e->decl_id && d->die_parent == e->die_parent;
++}
++
+ /* Generate a DIE to represent a declared data object. */
+
+ static void
+@@ -13853,6 +13879,7 @@ gen_variable_die (tree decl, dw_die_ref
+ tree field;
+ dw_die_ref com_die;
+ dw_loc_descr_ref loc;
++ die_node com_die_arg;
+
+ var_die = lookup_decl_die (decl);
+ if (var_die)
+@@ -13863,21 +13890,41 @@ gen_variable_die (tree decl, dw_die_ref
+ if (loc)
+ {
+ if (off)
+- add_loc_descr (&loc, new_loc_descr (DW_OP_plus_uconst,
++ {
++ /* Optimize the common case. */
++ if (loc->dw_loc_opc == DW_OP_addr
++ && loc->dw_loc_next == NULL
++ && GET_CODE (loc->dw_loc_oprnd1.v.val_addr)
++ == SYMBOL_REF)
++ loc->dw_loc_oprnd1.v.val_addr
++ = plus_constant (loc->dw_loc_oprnd1.v.val_addr, off);
++ else
++ add_loc_descr (&loc,
++ new_loc_descr (DW_OP_plus_uconst,
+ off, 0));
++ }
+ add_AT_loc (var_die, DW_AT_location, loc);
+ remove_AT (var_die, DW_AT_declaration);
+ }
+ }
+ return;
+ }
++
++ if (common_block_die_table == NULL)
++ common_block_die_table
++ = htab_create_ggc (10, common_block_die_table_hash,
++ common_block_die_table_eq, NULL);
++
+ field = TREE_OPERAND (DECL_VALUE_EXPR (decl), 0);
+- com_die = lookup_decl_die (com_decl);
++ com_die_arg.decl_id = DECL_UID (com_decl);
++ com_die_arg.die_parent = context_die;
++ com_die = (dw_die_ref) htab_find (common_block_die_table, &com_die_arg);
+ loc = loc_descriptor_from_tree (com_decl);
+ if (com_die == NULL)
+ {
+ const char *cnam
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (com_decl));
++ void **slot;
+
+ com_die = new_die (DW_TAG_common_block, context_die, decl);
+ add_name_and_src_coords_attributes (com_die, com_decl);
+@@ -13891,7 +13938,9 @@ gen_variable_die (tree decl, dw_die_ref
+ else if (DECL_EXTERNAL (decl))
+ add_AT_flag (com_die, DW_AT_declaration, 1);
+ add_pubname_string (cnam, com_die); /* ??? needed? */
+- equate_decl_number_to_die (com_decl, com_die);
++ com_die->decl_id = DECL_UID (com_decl);
++ slot = htab_find_slot (common_block_die_table, com_die, INSERT);
++ *slot = (void *) com_die;
+ }
+ else if (get_AT (com_die, DW_AT_location) == NULL && loc)
+ {
+@@ -13907,7 +13956,17 @@ gen_variable_die (tree decl, dw_die_ref
+ if (loc)
+ {
+ if (off)
+- add_loc_descr (&loc, new_loc_descr (DW_OP_plus_uconst, off, 0));
++ {
++ /* Optimize the common case. */
++ if (loc->dw_loc_opc == DW_OP_addr
++ && loc->dw_loc_next == NULL
++ && GET_CODE (loc->dw_loc_oprnd1.v.val_addr) == SYMBOL_REF)
++ loc->dw_loc_oprnd1.v.val_addr
++ = plus_constant (loc->dw_loc_oprnd1.v.val_addr, off);
++ else
++ add_loc_descr (&loc, new_loc_descr (DW_OP_plus_uconst,
++ off, 0));
++ }
+ add_AT_loc (var_die, DW_AT_location, loc);
+ }
+ else if (DECL_EXTERNAL (decl))
+--- gcc/fortran/f95-lang.c (revision 140943)
++++ gcc/fortran/f95-lang.c (revision 140945)
+@@ -457,14 +457,8 @@ poplevel (int keep, int reverse, int fun
+ current_binding_level = current_binding_level->level_chain;
+
+ if (functionbody)
+- {
+- /* This is the top level block of a function. The ..._DECL chain stored
+- in BLOCK_VARS are the function's parameters (PARM_DECL nodes). Don't
+- leave them in the BLOCK because they are found in the FUNCTION_DECL
+- instead. */
+- DECL_INITIAL (current_function_decl) = block_node;
+- BLOCK_VARS (block_node) = 0;
+- }
++ /* This is the top level block of a function. */
++ DECL_INITIAL (current_function_decl) = block_node;
+ else if (current_binding_level == global_binding_level)
+ /* When using gfc_start_block/gfc_finish_block from middle-end hooks,
+ don't add newly created BLOCKs as sublocks of global_binding_level. */
+--- gcc/fortran/trans-decl.c (revision 140943)
++++ gcc/fortran/trans-decl.c (revision 140945)
+@@ -704,7 +704,7 @@ gfc_build_qualified_array (tree decl, gf
+ layout_type (type);
+ }
+
+- if (nest || write_symbols == NO_DEBUG)
++ if (write_symbols == NO_DEBUG)
+ return;
+
+ if (TYPE_NAME (type) != NULL_TREE
+@@ -1761,7 +1761,7 @@ build_entry_thunks (gfc_namespace * ns)
+
+ thunk_fndecl = thunk_sym->backend_decl;
+
+- gfc_start_block (&body);
++ gfc_init_block (&body);
+
+ /* Pass extra parameter identifying this entry point. */
+ tmp = build_int_cst (gfc_array_index_type, el->id);
+@@ -1869,8 +1869,12 @@ build_entry_thunks (gfc_namespace * ns)
+
+ /* Finish off this function and send it for code generation. */
+ DECL_SAVED_TREE (thunk_fndecl) = gfc_finish_block (&body);
++ tmp = getdecls ();
+ poplevel (1, 0, 1);
+ BLOCK_SUPERCONTEXT (DECL_INITIAL (thunk_fndecl)) = thunk_fndecl;
++ DECL_SAVED_TREE (thunk_fndecl)
++ = build3_v (BIND_EXPR, tmp, DECL_SAVED_TREE (thunk_fndecl),
++ DECL_INITIAL (thunk_fndecl));
+
+ /* Output the GENERIC tree. */
+ dump_function (TDI_original, thunk_fndecl);
+@@ -3652,7 +3656,7 @@ gfc_generate_function_code (gfc_namespac
+
+ trans_function_start (sym);
+
+- gfc_start_block (&block);
++ gfc_init_block (&block);
+
+ if (ns->entries && ns->proc_name->ts.type == BT_CHARACTER)
+ {
+@@ -3886,11 +3890,16 @@ gfc_generate_function_code (gfc_namespac
+ saved_function_decls = NULL_TREE;
+
+ DECL_SAVED_TREE (fndecl) = gfc_finish_block (&block);
++ decl = getdecls ();
+
+ /* Finish off this function and send it for code generation. */
+ poplevel (1, 0, 1);
+ BLOCK_SUPERCONTEXT (DECL_INITIAL (fndecl)) = fndecl;
+
++ DECL_SAVED_TREE (fndecl)
++ = build3_v (BIND_EXPR, decl, DECL_SAVED_TREE (fndecl),
++ DECL_INITIAL (fndecl));
++
+ /* Output the GENERIC tree. */
+ dump_function (TDI_original, fndecl);
+
+@@ -3969,9 +3978,13 @@ gfc_generate_constructors (void)
+ DECL_SAVED_TREE (fndecl) = build_stmt (EXPR_STMT, tmp);
+ }
+
++ decl = getdecls ();
+ poplevel (1, 0, 1);
+
+ BLOCK_SUPERCONTEXT (DECL_INITIAL (fndecl)) = fndecl;
++ DECL_SAVED_TREE (fndecl)
++ = build3_v (BIND_EXPR, decl, DECL_SAVED_TREE (fndecl),
++ DECL_INITIAL (fndecl));
+
+ free_after_parsing (cfun);
+ free_after_compilation (cfun);
diff --git a/gcc43.spec b/gcc43.spec
index a17ff43..3aafd7d 100644
--- a/gcc43.spec
+++ b/gcc43.spec
@@ -1,9 +1,9 @@
-%define DATE 20080917
-%define SVNREV 140410
+%define DATE 20081008
+%define SVNREV 140973
%define gcc_version 4.3.2
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 4
+%define gcc_release 5
%define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64
%define include_gappletviewer 1
@@ -156,6 +156,9 @@ Patch19: gcc43-altivec-tests.patch
Patch20: gcc43-libtool-no-rpath.patch
Patch21: gcc43-pr36741-revert.patch
Patch22: gcc43-pr34037.patch
+Patch23: gcc43-pr37738.patch
+Patch24: gcc43-pr29609.patch
+Patch25: gcc43-aes.patch
# On ARM EABI systems, we do want -gnueabi to be part of the
# target triple.
@@ -462,6 +465,9 @@ which are required to run programs compiled with the GNAT.
%patch20 -p0 -b .libtool-no-rpath~
%patch21 -p0 -b .pr36741-revert~
%patch22 -p0 -b .pr34037~
+%patch23 -p0 -b .pr37738~
+%patch24 -p0 -b .pr29609~
+%patch25 -p0 -b .aes~
tar xzf %{SOURCE4}
@@ -1284,6 +1290,7 @@ fi
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/smmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/nmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/bmmintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/wmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mmintrin-common.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
@@ -1710,8 +1717,22 @@ fi
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog
+* Wed Oct 8 2008 Jakub Jelinek <jakub@redhat.com> 4.3.2-5
+- update from gcc-4_3-branch
+ - PRs c++/37555, c/35712, c/37645, fortran/35770, fortran/35945,
+ fortran/36374, fortran/36454, fortran/36700, fortran/37274,
+ fortran/37504, fortran/37580, fortran/37583, fortran/37626,
+ fortran/37706, middle-end/36575, middle-end/37236, middle-end/37731,
+ rtl-optimization/37544, target/35620, target/35713, target/37603,
+ tree-opt/35737, tree-optimization/36343, tree-optimization/37539
+- ensure one can put breakpoints on break, continue and goto statements
+ with -g -O0 (#465824, PRs debug/29609, debug/36690, debug/37616)
+- emit one DW_TAG_common_block for each common block in each scope, not
+ one for each common block in one CU (#465974, PR debug/37738)
+- Intel -maes and -mpclmul support
+
* Wed Sep 17 2008 Jakub Jelinek <jakub@redhat.com> 4.3.2-4
-- update from 4.3 branch
+- update from gcc-4_3-branch
- PRs c++/37389, fortran/35837, fortran/36214, fortran/37099, fortran/37199,
rtl-optimization/37408, target/37466, tree-optimization/36630
- revert PR c++/36741 fix
diff --git a/sources b/sources
index 082f61c..bae9588 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-78b4e6400e20ea3011ae7c887f8338d2 gcc-4.3.2-20080917.tar.bz2
+39dfde91a766f447711d967c4806da89 gcc-4.3.2-20081008.tar.bz2
92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz
reply other threads:[~2026-06-29 12:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178273583708.1.6426932397377216597.rpms-gcc-469bb9a9441d@fedoraproject.org \
--to=jakub@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox