aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain-layer
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-05-15 14:45:57 -0700
committerKhem Raj <raj.khem@gmail.com>2012-05-15 14:48:59 -0700
commit6291c6fd1243d722e144466921064d47fb50428b (patch)
treea60d1cb9952db6786fcb60ce1accc596f5fba2ef /toolchain-layer
parent93898b626e2e169dea112c724ff9e7ed1b0e14eb (diff)
downloadmeta-openembedded-6291c6fd1243d722e144466921064d47fb50428b.tar.gz
meta-openembedded-6291c6fd1243d722e144466921064d47fb50428b.tar.bz2
meta-openembedded-6291c6fd1243d722e144466921064d47fb50428b.zip
gcc-4.5: Remove
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'toolchain-layer')
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5.inc274
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch37
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch20
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/64bithack.patch68
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch29
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch34
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch74
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/COLLECT_GCC_OPTIONS.patch23
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch178
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch30
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch18
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch36
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch31
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/cpp-honour-sysroot.patch36
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch44
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch114
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch284
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch65
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch550
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch19
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch48
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch2797
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch90
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch16
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch19
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch159
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch89
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch31
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch32
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc45-no-add-needed.patch60
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch30
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch319
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch31
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2bin6957305 -> 0 bytes
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch103
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch29
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch178
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch331
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch25
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch83
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch201
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ppc-config-fix.patch221
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch117
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch63
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch67
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-with-linker-hash-style.patch212
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch9
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch40
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch71
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch207
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch26654
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99299.patch62
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99300.patch3094
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch674
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99302.patch244
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99303.patch131
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99304.patch81
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99305.patch52
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99306.patch1401
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99307.patch138
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99308.patch112
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99310.patch36
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99312.patch714
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99313.patch37
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99314.patch433
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99315.patch57
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99316.patch76
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99318.patch118
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99319.patch197
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99320.patch138
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99321.patch28
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99322.patch53
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99323.patch688
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99324.patch109
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99325.patch174
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99326.patch86
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99327.patch132
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99332.patch68
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99335.patch138
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99336.patch95
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99337.patch36
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99338.patch111
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99339.patch236
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99340.patch43
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99341.patch28
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99342.patch76
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99343.patch132
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99344.patch30
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99345.patch30
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99346.patch170
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99348.patch37
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99349.patch401
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch184
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch548
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch118
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99353.patch298
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99354.patch384
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99355.patch181
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99356.patch376
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99357.patch27
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99358.patch38
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99359.patch27
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99360.patch1759
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99361.patch17586
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99363.patch95
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99364.patch511
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99365.patch38
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99366.patch26
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99367.patch49
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99368.patch342
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99369.patch53
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99371.patch663
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99372.patch380
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99373.patch360
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99374.patch72
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch146
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99376.patch35
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99377.patch28
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99378.patch159
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99379.patch2011
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99380.patch2985
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99381.patch512
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99383.patch369
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99384.patch1202
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99385.patch151
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99388.patch191
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99391.patch43
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99392.patch33
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99393.patch45
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99395.patch26
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99396.patch1721
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99397.patch3565
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99398.patch76
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99402.patch1268
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch176
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99404.patch386
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99405.patch36
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99406.patch20
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99407.patch33
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99408.patch603
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99409.patch18
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99410.patch32
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99411.patch21
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99412.patch316
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99413.patch26
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99415.patch46
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99416.patch130
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99417.patch53
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99418.patch25
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99419.patch734
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99420.patch38
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99421.patch94
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99423.patch114
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99424.patch697
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99425.patch128
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99426.patch41
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99429.patch1257
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99432.patch70
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99433.patch40
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99434.patch30
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99435.patch32
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99436.patch210
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99437.patch27
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99439.patch1500
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99440.patch78
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99441.patch33
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99442.patch23
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99443.patch873
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99444.patch183
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99449.patch34
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99450.patch104
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99451.patch45
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99452.patch201
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99453.patch72
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99454.patch46
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99455.patch65
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99456.patch3163
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99457.patch4236
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99464.patch157
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99465.patch94
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99466.patch38
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99468.patch811
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99473.patch409
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99474.patch3346
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99475.patch4075
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch74
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch101
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch64
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch63
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99486.patch230
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99487.patch42
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99488.patch22
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99489.patch61
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99494.patch1272
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99495.patch784
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99498.patch186
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99502.patch134
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99503.patch6070
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99504.patch26
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99506.patch21
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99507.patch20
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99510.patch24
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99511.patch582
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99514.patch32
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99516.patch45
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99519.patch25
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99521.patch166
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99522.patch210
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99523.patch119
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99524.patch209
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99525.patch67
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99528.patch138
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99529.patch741
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99530.patch27
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99531.patch25
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99532.patch456
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99533.patch63
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99534.patch39
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99536.patch33
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99537.patch105
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99540.patch23
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99548.patch80
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99549.patch460
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/mips64-nomultilib.patch52
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/more-epilogues.patch83
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/optional_libstdc.patch23
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/pr30961.dpatch179
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/pr35942.patch38
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/sh4-multilib.patch25
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/use-defaults.h-and-t-oe-in-B.patch57
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/zecke-no-host-includes.patch31
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-4.5/zecke-xgcc-cpp.patch28
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb24
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-cross-initial_4.5.bb4
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb3
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-cross_4.5.bb9
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb3
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb3
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-crosssdk_4.5.bb3
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.5.bb8
-rw-r--r--toolchain-layer/recipes-devtools/gcc/gcc_4.5.bb7
-rw-r--r--toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb71
242 files changed, 0 insertions, 122182 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5.inc b/toolchain-layer/recipes-devtools/gcc/gcc-4.5.inc
deleted file mode 100644
index 8fabf3044..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5.inc
+++ /dev/null
@@ -1,274 +0,0 @@
-require recipes-devtools/gcc/gcc-common.inc
-ARM_INSTRUCTION_SET = "arm"
-
-DEPENDS =+ "mpfr gmp libmpc elfutils"
-NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
-
-LICENSE="GPL-3.0-with-GCC-exception & GPLv2 & GPLv3 & LGPLv2.1 & LGPLv3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
- file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
- file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
-
-
-PV = "4.5"
-PR = "r49"
-
-# BINV should be incremented after updating to a revision
-# after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
-# the value will be minor-release+1 e.g. if minor release was
-# 4.5.1 then the value below will be 2 which will mean 4.5.2
-# which will be next minor release and so on.
-
-BINV = "${PV}.4"
-SRCREV = "184907"
-BRANCH = "gcc-4_5-branch"
-PR_append = "+svnr${SRCPV}"
-
-SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
- file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
- file://100-uclibc-conf.patch \
- file://gcc-uclibc-locale-ctype_touplow_t.patch \
- file://cache-amnesia.patch \
- file://gcc-flags-for-build.patch \
- file://libstdc++-emit-__cxa_end_cleanup-in-text.patch \
- file://Makefile.in.patch \
- file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
- file://sh4-multilib.patch \
- file://arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch \
- file://cpp-honour-sysroot.patch \
- \
- file://linaro/gcc-4.5-linaro-r99297.patch \
- file://linaro/gcc-4.5-linaro-r99298.patch \
- file://linaro/gcc-4.5-linaro-r99299.patch \
- file://linaro/gcc-4.5-linaro-r99300.patch \
- file://linaro/gcc-4.5-linaro-r99301.patch \
- file://linaro/gcc-4.5-linaro-r99302.patch \
- file://linaro/gcc-4.5-linaro-r99303.patch \
- file://linaro/gcc-4.5-linaro-r99304.patch \
- file://linaro/gcc-4.5-linaro-r99305.patch \
- file://linaro/gcc-4.5-linaro-r99306.patch \
- file://linaro/gcc-4.5-linaro-r99307.patch \
- file://linaro/gcc-4.5-linaro-r99308.patch \
- file://linaro/gcc-4.5-linaro-r99310.patch \
- file://linaro/gcc-4.5-linaro-r99312.patch \
- file://linaro/gcc-4.5-linaro-r99313.patch \
- file://linaro/gcc-4.5-linaro-r99314.patch \
- file://linaro/gcc-4.5-linaro-r99315.patch \
- file://linaro/gcc-4.5-linaro-r99316.patch \
- file://linaro/gcc-4.5-linaro-r99318.patch \
- file://linaro/gcc-4.5-linaro-r99319.patch \
- file://linaro/gcc-4.5-linaro-r99320.patch \
- file://linaro/gcc-4.5-linaro-r99321.patch \
- file://linaro/gcc-4.5-linaro-r99322.patch \
- file://linaro/gcc-4.5-linaro-r99323.patch \
- file://linaro/gcc-4.5-linaro-r99324.patch \
- file://linaro/gcc-4.5-linaro-r99325.patch \
- file://linaro/gcc-4.5-linaro-r99326.patch \
- file://linaro/gcc-4.5-linaro-r99327.patch \
- file://linaro/gcc-4.5-linaro-r99332.patch \
- file://linaro/gcc-4.5-linaro-r99335.patch \
- file://linaro/gcc-4.5-linaro-r99336.patch \
- file://linaro/gcc-4.5-linaro-r99337.patch \
- file://linaro/gcc-4.5-linaro-r99338.patch \
- file://linaro/gcc-4.5-linaro-r99339.patch \
- file://linaro/gcc-4.5-linaro-r99340.patch \
- file://linaro/gcc-4.5-linaro-r99341.patch \
- file://linaro/gcc-4.5-linaro-r99342.patch \
- file://linaro/gcc-4.5-linaro-r99343.patch \
- file://linaro/gcc-4.5-linaro-r99344.patch \
- file://linaro/gcc-4.5-linaro-r99345.patch \
- file://linaro/gcc-4.5-linaro-r99346.patch \
- file://linaro/gcc-4.5-linaro-r99348.patch \
- file://linaro/gcc-4.5-linaro-r99349.patch \
- file://linaro/gcc-4.5-linaro-r99351.patch \
- file://linaro/gcc-4.5-linaro-r99352.patch \
- file://linaro/gcc-4.5-linaro-r99353.patch \
- file://linaro/gcc-4.5-linaro-r99354.patch \
- file://linaro/gcc-4.5-linaro-r99355.patch \
- file://linaro/gcc-4.5-linaro-r99356.patch \
- file://linaro/gcc-4.5-linaro-r99357.patch \
- file://linaro/gcc-4.5-linaro-r99358.patch \
- file://linaro/gcc-4.5-linaro-r99359.patch \
- file://linaro/gcc-4.5-linaro-r99360.patch \
- file://linaro/gcc-4.5-linaro-r99361.patch \
- file://linaro/gcc-4.5-linaro-r99363.patch \
- file://linaro/gcc-4.5-linaro-r99364.patch \
- file://linaro/gcc-4.5-linaro-r99365.patch \
- file://linaro/gcc-4.5-linaro-r99366.patch \
- file://linaro/gcc-4.5-linaro-r99367.patch \
- file://linaro/gcc-4.5-linaro-r99368.patch \
- file://linaro/gcc-4.5-linaro-r99369.patch \
- file://linaro/gcc-4.5-linaro-r99371.patch \
- file://linaro/gcc-4.5-linaro-r99372.patch \
- file://linaro/gcc-4.5-linaro-r99373.patch \
- file://linaro/gcc-4.5-linaro-r99374.patch \
- file://linaro/gcc-4.5-linaro-r99375.patch \
- file://linaro/gcc-4.5-linaro-r99376.patch \
- file://linaro/gcc-4.5-linaro-r99377.patch \
- file://linaro/gcc-4.5-linaro-r99378.patch \
- file://linaro/gcc-4.5-linaro-r99379.patch \
- file://linaro/gcc-4.5-linaro-r99380.patch \
- file://linaro/gcc-4.5-linaro-r99381.patch \
- file://linaro/gcc-4.5-linaro-r99383.patch \
- file://linaro/gcc-4.5-linaro-r99384.patch \
- file://linaro/gcc-4.5-linaro-r99385.patch \
- file://linaro/gcc-4.5-linaro-r99388.patch \
- file://linaro/gcc-4.5-linaro-r99391.patch \
- file://linaro/gcc-4.5-linaro-r99392.patch \
- file://linaro/gcc-4.5-linaro-r99393.patch \
- file://linaro/gcc-4.5-linaro-r99395.patch \
- file://linaro/gcc-4.5-linaro-r99396.patch \
- file://linaro/gcc-4.5-linaro-r99397.patch \
- file://linaro/gcc-4.5-linaro-r99398.patch \
- file://linaro/gcc-4.5-linaro-r99402.patch \
- file://linaro/gcc-4.5-linaro-r99403.patch \
- file://linaro/gcc-4.5-linaro-r99404.patch \
- file://linaro/gcc-4.5-linaro-r99405.patch \
- file://linaro/gcc-4.5-linaro-r99406.patch \
- file://linaro/gcc-4.5-linaro-r99407.patch \
- file://linaro/gcc-4.5-linaro-r99408.patch \
- file://linaro/gcc-4.5-linaro-r99409.patch \
- file://linaro/gcc-4.5-linaro-r99410.patch \
- file://linaro/gcc-4.5-linaro-r99411.patch \
- file://linaro/gcc-4.5-linaro-r99412.patch \
- file://linaro/gcc-4.5-linaro-r99413.patch \
- file://linaro/gcc-4.5-linaro-r99415.patch \
- file://linaro/gcc-4.5-linaro-r99416.patch \
- file://linaro/gcc-4.5-linaro-r99417.patch \
- file://linaro/gcc-4.5-linaro-r99418.patch \
- file://linaro/gcc-4.5-linaro-r99419.patch \
- file://linaro/gcc-4.5-linaro-r99420.patch \
- file://linaro/gcc-4.5-linaro-r99421.patch \
- file://linaro/gcc-4.5-linaro-r99423.patch \
- file://linaro/gcc-4.5-linaro-r99424.patch \
- file://linaro/gcc-4.5-linaro-r99425.patch \
- file://linaro/gcc-4.5-linaro-r99426.patch \
- file://linaro/gcc-4.5-linaro-r99429.patch \
- file://linaro/gcc-4.5-linaro-r99432.patch \
- file://linaro/gcc-4.5-linaro-r99433.patch \
- file://linaro/gcc-4.5-linaro-r99434.patch \
- file://linaro/gcc-4.5-linaro-r99435.patch \
- file://linaro/gcc-4.5-linaro-r99436.patch \
- file://linaro/gcc-4.5-linaro-r99437.patch \
- file://linaro/gcc-4.5-linaro-r99439.patch \
- file://linaro/gcc-4.5-linaro-r99440.patch \
- file://linaro/gcc-4.5-linaro-r99441.patch \
- file://linaro/gcc-4.5-linaro-r99442.patch \
- file://linaro/gcc-4.5-linaro-r99443.patch \
- file://linaro/gcc-4.5-linaro-r99444.patch \
- file://linaro/gcc-4.5-linaro-r99449.patch \
- file://linaro/gcc-4.5-linaro-r99450.patch \
- file://linaro/gcc-4.5-linaro-r99451.patch \
- file://linaro/gcc-4.5-linaro-r99452.patch \
- file://linaro/gcc-4.5-linaro-r99453.patch \
- file://linaro/gcc-4.5-linaro-r99454.patch \
- file://linaro/gcc-4.5-linaro-r99455.patch \
- file://linaro/gcc-4.5-linaro-r99464.patch \
- file://linaro/gcc-4.5-linaro-r99465.patch \
- file://linaro/gcc-4.5-linaro-r99466.patch \
- file://linaro/gcc-4.5-linaro-r99468.patch \
- file://linaro/gcc-4.5-linaro-r99473.patch \
- file://linaro/gcc-4.5-linaro-r99475.patch \
- file://linaro/gcc-4.5-linaro-r99478.patch \
- file://linaro/gcc-4.5-linaro-r99479.patch \
- file://linaro/gcc-4.5-linaro-r99480.patch \
- file://linaro/gcc-4.5-linaro-r99483.patch \
- file://linaro/gcc-4.5-linaro-r99488.patch \
- file://linaro/gcc-4.5-linaro-r99489.patch \
- file://linaro/gcc-4.5-linaro-r99494.patch \
- file://linaro/gcc-4.5-linaro-r99495.patch \
- file://linaro/gcc-4.5-linaro-r99498.patch \
- file://linaro/gcc-4.5-linaro-r99502.patch \
- file://linaro/gcc-4.5-linaro-r99503.patch \
- file://linaro/gcc-4.5-linaro-r99504.patch \
- file://linaro/gcc-4.5-linaro-r99506.patch \
- file://linaro/gcc-4.5-linaro-r99507.patch \
- file://linaro/gcc-4.5-linaro-r99510.patch \
- file://linaro/gcc-4.5-linaro-r99511.patch \
- file://linaro/gcc-4.5-linaro-r99514.patch \
- file://linaro/gcc-4.5-linaro-r99516.patch \
- file://linaro/gcc-4.5-linaro-r99519.patch \
- file://linaro/gcc-4.5-linaro-r99521.patch \
- file://linaro/gcc-4.5-linaro-r99522.patch \
- file://linaro/gcc-4.5-linaro-r99523.patch \
- file://linaro/gcc-4.5-linaro-r99524.patch \
- file://linaro/gcc-4.5-linaro-r99525.patch \
- file://linaro/gcc-4.5-linaro-r99528.patch \
- file://linaro/gcc-4.5-linaro-r99529.patch \
- file://linaro/gcc-4.5-linaro-r99530.patch \
- file://linaro/gcc-4.5-linaro-r99531.patch \
- file://linaro/gcc-4.5-linaro-r99532.patch \
- file://linaro/gcc-4.5-linaro-r99533.patch \
- file://linaro/gcc-4.5-linaro-r99534.patch \
- file://linaro/gcc-4.5-linaro-r99536.patch \
- file://linaro/gcc-4.5-linaro-r99537.patch \
- file://linaro/gcc-4.5-linaro-r99540.patch \
- file://linaro/gcc-4.5-linaro-r99548.patch \
- file://linaro/gcc-4.5-linaro-r99549.patch \
- \
- file://more-epilogues.patch \
- file://gcc-scalar-widening-pr45847.patch \
- file://gcc-arm-volatile-bitfield-fix.patch \
- \
- file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
- file://fedora/gcc43-ia64-libunwind.patch;striplevel=0 \
- file://fedora/gcc43-java-nomulti.patch;striplevel=0 \
- file://fedora/gcc43-ppc32-retaddr.patch;striplevel=0 \
- file://fedora/gcc43-pr32139.patch;striplevel=0 \
- file://fedora/gcc43-pr33763.patch;striplevel=0 \
- file://fedora/gcc43-rh330771.patch;striplevel=0 \
- file://fedora/gcc43-rh341221.patch;striplevel=0 \
- file://fedora/gcc43-java-debug-iface-type.patch;striplevel=0 \
- file://fedora/gcc43-i386-libgomp.patch;striplevel=0 \
- file://fedora/gcc45-no-add-needed.patch;striplevel=0 \
- file://optional_libstdc.patch \
- file://64bithack.patch \
- file://COLLECT_GCC_OPTIONS.patch \
- file://gcc-poison-dir-extend.patch \
- file://gcc-poison-parameters.patch \
- file://gcc-ppc-config-fix.patch \
- file://use-defaults.h-and-t-oe-in-B.patch \
- file://gcc-with-linker-hash-style.patch \
- file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
- \
- file://fortran-cross-compile-hack.patch \
- "
-
-# Language Overrides
-FORTRAN = ""
-JAVA = ""
-
-S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}"
-B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}"
-
-#EXTRA_OECONF_BASE = " --enable-cheaders=c_std \
-# --enable-libssp \
-# --disable-bootstrap \
-# --disable-libgomp \
-# --disable-libmudflap"
-EXTRA_OECONF_BASE = "--enable-lto \
- --enable-libssp \
- --disable-bootstrap \
- --disable-libgomp \
- --disable-libmudflap \
- --with-linker-hash-style=${LINKER_HASH_STYLE} \
- --with-ppl=no \
- --with-cloog=no \
- --enable-cheaders=c_global "
-
-EXTRA_OECONF_INITIAL = "--disable-libmudflap \
- --disable-libgomp \
- --disable-libssp \
- --enable-decimal-float=no"
-
-EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
- --disable-libgomp \
- --disable-libssp"
-
-EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
-EXTRA_OECONF_append_mips64 = " --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64el = " --with-arch-64=mips64 --with-tune-64=mips64"
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch
deleted file mode 100644
index 0b799607e..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh 2007-12-24 15:18:57.000000000 -0800
-+++ gcc-4.3.1/contrib/regression/objs-gcc.sh 2008-08-16 01:15:12.000000000 -0700
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-Index: gcc-4.3.1/libjava/classpath/ltconfig
-===================================================================
---- gcc-4.3.1.orig/libjava/classpath/ltconfig 2007-06-03 16:18:43.000000000 -0700
-+++ gcc-4.3.1/libjava/classpath/ltconfig 2008-08-16 01:15:12.000000000 -0700
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch
deleted file mode 100644
index 23fce7544..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gcc-4.1.0/libstdc++-v3/fragment.am 2005-03-21 11:40:14.000000000 -0600
-+++ gcc-4.1.0-patched/libstdc++-v3/fragment.am 2005-04-25 20:14:39.856251785 -0500
-@@ -21,5 +21,5 @@
- $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
-
- # -I/-D flags to pass when compiling.
--AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
-
---- gcc-4.1.0/libstdc++-v3/libmath/Makefile.am 2005-03-21 11:40:18.000000000 -0600
-+++ gcc-4.1.0-patched/libstdc++-v3/libmath/Makefile.am 2005-04-25 20:14:39.682280735 -0500
-@@ -35,7 +35,7 @@
-
- libmath_la_SOURCES = stubs.c
-
--AM_CPPFLAGS = $(CANADIAN_INCLUDES)
-+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
-
- # Only compiling "C" sources in this directory.
- LIBTOOL = @LIBTOOL@ --tag CC
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/64bithack.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/64bithack.patch
deleted file mode 100644
index 70330145e..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/64bithack.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid directory
-layout. The build system implementation of multilib layout is very generic and allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the current
-directory, "."). We need to do this for each multilib that is configured as we don't
-know which compiler options may be being passed into the compiler. Since we have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with which paths
-and be able to patch these entries with a complete set of correct paths but this we
-don't have such code at this point. This is something the target gcc recipe should do
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: gcc-4_5-branch/gcc/config/i386/t-linux64
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/i386/t-linux64 2011-09-22 11:37:51.188913390 -0700
-+++ gcc-4_5-branch/gcc/config/i386/t-linux64 2011-09-22 11:37:56.818913303 -0700
-@@ -24,8 +24,8 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS = m64/m32
--MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-Index: gcc-4_5-branch/gcc/config/mips/t-linux64
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/mips/t-linux64 2011-06-16 17:59:02.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/mips/t-linux64 2011-09-22 11:37:56.838913302 -0700
-@@ -17,8 +17,8 @@
- # <http://www.gnu.org/licenses/>.
-
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
-
-Index: gcc-4_5-branch/gcc/config/rs6000/t-linux64
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/rs6000/t-linux64 2011-06-16 17:58:58.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/rs6000/t-linux64 2011-09-22 11:37:56.838913302 -0700
-@@ -32,11 +32,11 @@ TARGET_LIBGCC2_CFLAGS += -mno-minimal-to
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS = m64/m32 msoft-float
--MULTILIB_DIRNAMES = 64 32 nof
-+MULTILIB_DIRNAMES = . . .
- MULTILIB_EXTRA_OPTS = fPIC mstrict-align
- MULTILIB_EXCEPTIONS = m64/msoft-float
- MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
-
- softfp_wrap_start := '\#ifndef __powerpc64__'
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch
deleted file mode 100644
index d84889259..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
-
-Index: gcc-4.5.0/gcc/configure.ac
-===================================================================
---- gcc-4.5.0.orig/gcc/configure.ac 2010-03-25 22:40:32.000000000 -0700
-+++ gcc-4.5.0/gcc/configure.ac 2010-06-25 11:02:48.489057877 -0700
-@@ -2784,7 +2784,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-Index: gcc-4.5.0/gcc/configure
-===================================================================
---- gcc-4.5.0.orig/gcc/configure 2010-03-25 22:40:32.000000000 -0700
-+++ gcc-4.5.0/gcc/configure 2010-06-25 11:02:48.508381845 -0700
-@@ -22156,7 +22156,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch
deleted file mode 100644
index 77d02c3ab..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-Index: gcc-4.5.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.5.0.orig/gcc/config/arm/linux-elf.h 2009-11-05 06:47:45.000000000 -0800
-+++ gcc-4.5.0/gcc/config/arm/linux-elf.h 2010-06-25 11:03:06.997132728 -0700
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-Index: gcc-4.5.0/gcc/config.gcc
-===================================================================
---- gcc-4.5.0.orig/gcc/config.gcc 2010-06-25 10:40:33.321880880 -0700
-+++ gcc-4.5.0/gcc/config.gcc 2010-06-25 11:03:07.013133525 -0700
-@@ -734,6 +734,11 @@
- esac
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-linux-*eabi)
- tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch
deleted file mode 100644
index c4641dc63..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-Index: gcc-4.5.0/gcc/stmt.c
-===================================================================
---- gcc-4.5.0.orig/gcc/stmt.c 2010-02-19 01:53:51.000000000 -0800
-+++ gcc-4.5.0/gcc/stmt.c 2010-06-25 11:05:31.816881094 -0700
-@@ -2440,7 +2440,11 @@
- default code is emitted. */
-
- use_cost_table = estimate_case_costs (case_list);
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -3008,6 +3012,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/COLLECT_GCC_OPTIONS.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/COLLECT_GCC_OPTIONS.patch
deleted file mode 100644
index 076e9a614..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/COLLECT_GCC_OPTIONS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#This patck added --sysroot into COLLECT_GCC_OPTIONS which is used to
-#invoke collect2.
-
-Index: gcc-4_5-branch/gcc/gcc.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/gcc.c
-+++ gcc-4_5-branch/gcc/gcc.c
-@@ -4667,6 +4667,15 @@ set_collect_gcc_options (void)
- sizeof ("COLLECT_GCC_OPTIONS=") - 1);
-
- first_time = TRUE;
-+#ifdef HAVE_LD_SYSROOT
-+ if (target_system_root_changed && target_system_root)
-+ {
-+ obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1);
-+ obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root));
-+ obstack_grow (&collect_obstack, "'", 1);
-+ first_time = FALSE;
-+ }
-+#endif
- for (i = 0; (int) i < n_switches; i++)
- {
- const char *const *args;
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
deleted file mode 100644
index 5c7b346ca..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-source: http://patchwork.ozlabs.org/patch/129800/
-Upstream-Status: Submitted
-
-ChangeLog
- * Makefile.in (gcc_gxx_include_dir_add_sysroot): New.
- (PREPROCESSOR_DEFINES): Define GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT.
-
- * cppdefault.c (cpp_include_defaults): replace hard coded "1" with
- GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT for "add_sysroot" field.
-
- * configure.ac (AC_SUBST): Add gcc_gxx_include_dir_add_sysroot to
- control whether sysroot should be prepended to gxx include dir.
-
- * configure: Regenerate.
-
-Hi, this is a follow up for issue "http://codereview.appspot.com/4641076".
-
-The rationale for the patch copied from previous thread:
-=======================================
-The setup:
-
-Configuring a toolchain targeting x86-64 GNU Linux (Ubuntu Lucid), as a
-cross-compiler. Using a sysroot to provide the Lucid headers+libraries,
-with the sysroot path being within the GCC install tree. Want to use the
-Lucid system libstdc++ and headers, which means that I'm not
-building/installing libstdc++-v3.
-
-So, configuring with:
- --with-sysroot="$SYSROOT"
- --disable-libstdc++-v3 \
- --with-gxx-include-dir="$SYSROOT/usr/include/c++/4.4" \
-(among other options).
-
-Hoping to support two usage models with this configuration, w.r.t. use of
-the sysroot:
-
-(1) somebody installs the sysroot in the normal location relative to the
-GCC install, and relocates the whole bundle (sysroot+GCC). This works
-great AFAICT, GCC finds its includes (including the C++ includes) thanks
-to the add_standard_paths iprefix handling.
-
-(2) somebody installs the sysroot in a non-standard location, and uses
---sysroot to try to access it. This works fine for the C headers, but
-doesn't work.
-
-For the C headers, add_standard_paths prepends the sysroot location to
-the /usr/include path (since that's what's specified in cppdefault.c for
-that path). It doesn't do the same for the C++ include path, though
-(again, as specified in cppdefault.c).
-
-add_standard_paths doesn't attempt to relocate built-in include paths that
-start with the compiled-in sysroot location (e.g., the g++ include dir, in
-this case). This isn't surprising really: normally you either prepend the
-sysroot location or you don't (as specified by cppdefault.c); none of the
-built-in paths normally *start* with the sysroot location and need to be
-relocated. However, in this odd-ball case of trying to use the C++ headers
-from the sysroot, one of the paths *does* need to be relocated in this way.
-===========================
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -585,6 +585,7 @@ slibdir = @slibdir@
- build_tooldir = $(exec_prefix)/$(target_noncanonical)
- # Directory in which the compiler finds target-independent g++ includes.
- gcc_gxx_include_dir = @gcc_gxx_include_dir@
-+gcc_gxx_include_dir_add_sysroot = @gcc_gxx_include_dir_add_sysroot@
- # Directory to search for site-specific includes.
- local_includedir = $(local_prefix)/include
- includedir = $(prefix)/include
-@@ -3788,6 +3789,7 @@ PREPROCESSOR_DEFINES = \
- -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
- -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
- -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-+ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
- -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
- -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -144,6 +144,15 @@ if test x${gcc_gxx_include_dir} = x; the
- fi
- fi
-
-+gcc_gxx_include_dir_add_sysroot=0
-+if test "${with_sysroot+set}" = set; then :
-+ gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
-+ if test "${gcc_gxx_without_sysroot}"; then :
-+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ gcc_gxx_include_dir_add_sysroot=1
-+ fi
-+fi
-+
- AC_ARG_WITH(cpp_install_dir,
- [ --with-cpp-install-dir=DIR
- install the user visible C preprocessor in DIR
-@@ -4492,6 +4501,7 @@ AC_SUBST(extra_programs)
- AC_SUBST(float_h_file)
- AC_SUBST(gcc_config_arguments)
- AC_SUBST(gcc_gxx_include_dir)
-+AC_SUBST(gcc_gxx_include_dir_add_sysroot)
- AC_SUBST(host_exeext)
- AC_SUBST(host_xm_file_list)
- AC_SUBST(host_xm_include_list)
---- a/gcc/cppdefault.c
-+++ b/gcc/cppdefault.c
-@@ -48,15 +48,18 @@ const struct default_include cpp_include
- = {
- #ifdef GPLUSPLUS_INCLUDE_DIR
- /* Pick up GNU C++ generic include files. */
-- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
-+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- #endif
- #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
- /* Pick up GNU C++ target-dependent include files. */
-- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0, 1 },
-+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },
- #endif
- #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
- /* Pick up GNU C++ backward and deprecated include files. */
-- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
-+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- #endif
- #ifdef LOCAL_INCLUDE_DIR
- /* /usr/local/include comes before the fixincluded header files. */
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -639,6 +639,7 @@ host_xm_defines
- host_xm_include_list
- host_xm_file_list
- host_exeext
-+gcc_gxx_include_dir_add_sysroot
- gcc_gxx_include_dir
- gcc_config_arguments
- float_h_file
-@@ -3282,6 +3283,15 @@ if test x${gcc_gxx_include_dir} = x; the
- fi
- fi
-
-+gcc_gxx_include_dir_add_sysroot=0
-+if test "${with_sysroot+set}" = set; then :
-+ gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
-+ if test "${gcc_gxx_without_sysroot}"; then :
-+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ gcc_gxx_include_dir_add_sysroot=1
-+ fi
-+fi
-+
-
- # Check whether --with-cpp_install_dir was given.
- if test "${with_cpp_install_dir+set}" = set; then :
-@@ -17118,7 +17128,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17121 "configure"
-+#line 17131 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -17224,7 +17234,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17227 "configure"
-+#line 17237 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -25381,6 +25391,7 @@ fi
-
-
-
-+
-
-
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch
deleted file mode 100644
index 45df47c5b..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.5/gcc/Makefile.in
-===================================================================
---- gcc-4.5.orig/gcc/Makefile.in
-+++ gcc-4.5/gcc/Makefile.in
-@@ -656,7 +656,7 @@ LIBGCC2_INCLUDES =
- TARGET_LIBGCC2_CFLAGS =
-
- # Options to use when compiling crtbegin/end.
--CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
-+CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(TARGET_INCLUDES) $(MULTILIB_CFLAGS) -g0 \
- -finhibit-size-directive -fno-inline -fno-exceptions \
- -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
- $(INHIBIT_LIBC_CFLAGS)
-@@ -1038,10 +1038,14 @@ BUILD_ERRORS = build/errors.o
- # -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file
- # currently being compiled, in both source trees, to be examined as well.
- # libintl.h will be found in ../intl if we are using the included libintl.
--INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
-+#
-+# TARGET_INCLUDES is added to avoid that GMPINC (which points to the host
-+# include dir) is used for compiling libgcc.a
-+TARGET_INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
- -I$(srcdir)/../include @INCINTL@ \
-- $(CPPINC) $(GMPINC) $(DECNUMINC) \
-+ $(CPPINC) $(DECNUMINC) \
- $(PPLINC) $(CLOOGINC) $(LIBELFINC)
-+INCLUDES = $(TARGET_INCLUDES) $(GMPINC)
-
- .c.o:
- $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch
deleted file mode 100644
index 39c90e7e7..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43999
-
-http://patchwork.ozlabs.org/patch/72260/ is the patch that made into
-upstream gcc
-
-diff --git a/gcc/config/arm/lib1funcs.asm b/gcc/config/arm/lib1funcs.asm
-index 085e690..2e76c01 100644
---- a/gcc/config/arm/lib1funcs.asm
-+++ b/gcc/config/arm/lib1funcs.asm
-@@ -641,7 +641,7 @@ pc .req r15
- subhs \dividend, \dividend, \divisor, lsr #3
- orrhs \result, \result, \curbit, lsr #3
- cmp \dividend, #0 @ Early termination?
-- do_it hs, t
-+ do_it ne, t
- movnes \curbit, \curbit, lsr #4 @ No, any more bits to do?
- movne \divisor, \divisor, lsr #4
- bne 1b
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch
deleted file mode 100644
index 7bb888706..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-
-# DP: Fix armv4t build on ARM
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p1 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- src/gcc/config/arm/linux-eabi.h.orig 2007-11-24 12:37:38.000000000 +0000
-+++ src/gcc/config/arm/linux-eabi.h 2007-11-24 12:39:41.000000000 +0000
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch
deleted file mode 100644
index b889f9b6c..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch
+++ /dev/null
@@ -1,31 +0,0 @@
----
- gcc/configure | 2 +-
- gcc/configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.5+svnr155514/gcc/configure
-===================================================================
---- gcc-4.5+svnr155514.orig/gcc/configure 2009-12-29 22:00:40.000000000 -0800
-+++ gcc-4.5+svnr155514/gcc/configure 2009-12-29 23:52:43.381592113 -0800
-@@ -10467,7 +10467,7 @@ else
- saved_CFLAGS="${CFLAGS}"
- CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
- LDFLAGS="${LDFLAGS_FOR_BUILD}" \
-- ${realsrcdir}/configure \
-+ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- --enable-languages=${enable_languages-all} \
- --target=$target_alias --host=$build_alias --build=$build_alias
- CFLAGS="${saved_CFLAGS}"
-Index: gcc-4.5+svnr155514/gcc/configure.ac
-===================================================================
---- gcc-4.5+svnr155514.orig/gcc/configure.ac 2009-12-29 22:00:40.000000000 -0800
-+++ gcc-4.5+svnr155514/gcc/configure.ac 2009-12-29 23:51:54.589091778 -0800
-@@ -1458,7 +1458,7 @@ else
- saved_CFLAGS="${CFLAGS}"
- CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
- LDFLAGS="${LDFLAGS_FOR_BUILD}" \
-- ${realsrcdir}/configure \
-+ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- --enable-languages=${enable_languages-all} \
- --target=$target_alias --host=$build_alias --build=$build_alias
- CFLAGS="${saved_CFLAGS}"
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cpp-honour-sysroot.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cpp-honour-sysroot.patch
deleted file mode 100644
index cf4c77c26..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/cpp-honour-sysroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
-preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
-rather than the --sysroot option specified on the commandline. If access to that directory is
-permission denied (unreadable), gcc will error.
-
-This happens when ccache is in use due to the fact it uses preprocessed source files.
-
-The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix,
--isystem, -isysroot happen and the correct sysroot is used.
-
-[YOCTO #2074]
-
-Upstream-Status: Pending
-
-RP 2012/04/13
-
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1106,7 +1106,7 @@ static const struct compiler default_com
- %W{o*:--output-pch=%*}%V}}}}}}", 0, 0, 0},
- {".i", "@cpp-output", 0, 1, 0},
- {"@cpp-output",
-- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
-+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
- {".s", "@assembler", 0, 1, 0},
- {"@assembler",
- "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
---- a/gcc/cp/lang-specs.h
-+++ b/gcc/cp/lang-specs.h
-@@ -63,5 +63,5 @@ along with GCC; see the file COPYING3.
- {".ii", "@c++-cpp-output", 0, 0, 0},
- {"@c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
-+ cc1plus -fpreprocessed %i %I %(cc1_options) %2 %{+e*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch
deleted file mode 100644
index b1d5a1a3c..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-GCC: disable MASK_RELAX_PIC_CALLS bit
-
-The new feature added after 4.3.3
-"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html"
-will cause cc1plus eat up all the system memory when build webkit-gtk.
-The function mips_get_pic_call_symbol keeps on recursively calling itself.
-Disable this feature to walk aside the bug.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-diff -ruN gcc-4.5.0-orig/gcc/configure gcc-4.5.0/gcc/configure
---- gcc-4.5.0-orig/gcc/configure 2010-09-17 23:30:21.000000000 +0800
-+++ gcc-4.5.0/gcc/configure 2010-09-19 18:21:28.000000000 +0800
-@@ -23945,13 +23945,6 @@
- rm -f conftest.*
- fi
- fi
-- if test $gcc_cv_as_ld_jalr_reloc = yes; then
-- if test x$target_cpu_default = x; then
-- target_cpu_default=MASK_RELAX_PIC_CALLS
-- else
-- target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
-- fi
-- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_ld_jalr_reloc" >&5
- $as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; }
-
-diff -ruN gcc-4.5.0-orig/gcc/configure.ac gcc-4.5.0/gcc/configure.ac
---- gcc-4.5.0-orig/gcc/configure.ac 2010-09-17 23:30:21.000000000 +0800
-+++ gcc-4.5.0/gcc/configure.ac 2010-09-19 18:21:11.000000000 +0800
-@@ -3467,13 +3467,6 @@
- rm -f conftest.*
- fi
- fi
-- if test $gcc_cv_as_ld_jalr_reloc = yes; then
-- if test x$target_cpu_default = x; then
-- target_cpu_default=MASK_RELAX_PIC_CALLS
-- else
-- target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
-- fi
-- fi
- AC_MSG_RESULT($gcc_cv_as_ld_jalr_reloc)
-
- AC_CACHE_CHECK([linker for .eh_frame personality relaxation],
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch
deleted file mode 100644
index a149eae98..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-2007-10-02 Jakub Jelinek <jakub@redhat.com>
-
- * decl.c (duplicate_decls): When redeclaring a builtin function,
- keep the merged decl builtin whenever types match, even if new
- decl defines a function.
-
- * gcc.dg/builtins-65.c: New test.
- * g++.dg/ext/builtin10.C: New test.
-
-Index: gcc/cp/decl.c
-===================================================================
---- gcc/cp/decl.c.orig 2010-04-01 11:48:46.000000000 -0700
-+++ gcc/cp/decl.c 2010-06-25 10:10:54.749131719 -0700
-@@ -2021,23 +2021,21 @@
- DECL_ARGUMENTS (olddecl) = DECL_ARGUMENTS (newdecl);
- DECL_RESULT (olddecl) = DECL_RESULT (newdecl);
- }
-+ /* If redeclaring a builtin function, it stays built in. */
-+ if (types_match && DECL_BUILT_IN (olddecl))
-+ {
-+ DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
-+ DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
-+ /* If we're keeping the built-in definition, keep the rtl,
-+ regardless of declaration matches. */
-+ COPY_DECL_RTL (olddecl, newdecl);
-+ }
- if (new_defines_function)
- /* If defining a function declared with other language
- linkage, use the previously declared language linkage. */
- SET_DECL_LANGUAGE (newdecl, DECL_LANGUAGE (olddecl));
- else if (types_match)
- {
-- /* If redeclaring a builtin function, and not a definition,
-- it stays built in. */
-- if (DECL_BUILT_IN (olddecl))
-- {
-- DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
-- DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
-- /* If we're keeping the built-in definition, keep the rtl,
-- regardless of declaration matches. */
-- COPY_DECL_RTL (olddecl, newdecl);
-- }
--
- DECL_RESULT (newdecl) = DECL_RESULT (olddecl);
- /* Don't clear out the arguments if we're just redeclaring a
- function. */
-Index: gcc/testsuite/gcc.dg/builtins-65.c
-===================================================================
---- gcc/testsuite/gcc.dg/builtins-65.c.orig 2009-06-26 02:02:04.000000000 -0700
-+++ gcc/testsuite/gcc.dg/builtins-65.c 2010-06-25 10:10:54.784464429 -0700
-@@ -1,3 +1,28 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+typedef __SIZE_TYPE__ size_t;
-+extern void __chk_fail (void);
-+extern int snprintf (char *, size_t, const char *, ...);
-+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
-+{
-+ if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
-+ __chk_fail ();
-+ return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
-+}
-+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
-+
-+char buf[10];
-+
-+int
-+main (void)
-+{
-+ snprintf (buf, 10, "%d%d\n", 10, 10);
-+ return 0;
-+}
-+
-+/* { dg-final { scan-assembler "mysnprintf" } } */
-+/* { dg-final { scan-assembler-not "__chk_fail" } } */
- /* { dg-do link } */
- /* { dg-options "-O2 -ffast-math" } */
- /* { dg-require-effective-target c99_runtime } */
-Index: gcc/testsuite/g++.dg/ext/builtin10.C
-===================================================================
---- gcc/testsuite/g++.dg/ext/builtin10.C.orig 2009-02-02 03:27:50.000000000 -0800
-+++ gcc/testsuite/g++.dg/ext/builtin10.C 2010-06-25 10:10:54.816467202 -0700
-@@ -1,3 +1,30 @@
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+typedef __SIZE_TYPE__ size_t;
-+extern "C" {
-+extern void __chk_fail (void);
-+extern int snprintf (char *, size_t, const char *, ...);
-+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
-+{
-+ if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
-+ __chk_fail ();
-+ return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
-+}
-+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
-+}
-+
-+char buf[10];
-+
-+int
-+main (void)
-+{
-+ snprintf (buf, 10, "%d%d\n", 10, 10);
-+ return 0;
-+}
-+
-+// { dg-final { scan-assembler "mysnprintf" } }
-+// { dg-final { scan-assembler-not "__chk_fail" } }
- // { dg-do compile { target correct_iso_cpp_string_wchar_protos } }
- // { dg-options "-O2 -fdump-tree-optimized" }
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch
deleted file mode 100644
index 00d37bd7c..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-2008-02-26 Jakub Jelinek <jakub@redhat.com>
-
- * c-ppoutput.c (scan_translation_unit): Handle CPP_PRAGMA
- and CPP_PRAGMA_EOL.
- * c-pragma.c (pragma_ns_name): New typedef.
- (registered_pp_pragmas): New variable.
- (c_pp_lookup_pragma): New function.
- (c_register_pragma_1): If flag_preprocess_only, do nothing
- for non-expanded pragmas, for expanded ones push pragma's
- namespace and name into registered_pp_pragmas vector.
- (c_invoke_pragma_handler): Register OpenMP pragmas even when
- flag_preprocess_only, don't register GCC pch_preprocess
- pragma if flag_preprocess_only.
- * c-opts.c (c_common_init): Call init_pragma even if
- flag_preprocess_only.
- * c-pragma.c (c_pp_lookup_pragma): New prototype.
- * config/darwin.h (DARWIN_REGISTER_TARGET_PRAGMAS): Don't call
- cpp_register_pragma if flag_preprocess_only.
-
- * gcc.dg/gomp/preprocess-1.c: New test.
-
---- gcc/c-ppoutput.c.jj 2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-ppoutput.c 2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Preprocess only, using cpplib.
-- Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
-- Free Software Foundation, Inc.
-+ Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007,
-+ 2008 Free Software Foundation, Inc.
- Written by Per Bothner, 1994-95.
-
- This program is free software; you can redistribute it and/or modify it
-@@ -177,7 +177,24 @@ scan_translation_unit (cpp_reader *pfile
- avoid_paste = false;
- print.source = NULL;
- print.prev = token;
-- cpp_output_token (token, print.outf);
-+ if (token->type == CPP_PRAGMA)
-+ {
-+ const char *space;
-+ const char *name;
-+
-+ maybe_print_line (token->src_loc);
-+ fputs ("#pragma ", print.outf);
-+ c_pp_lookup_pragma (token->val.pragma, &space, &name);
-+ if (space)
-+ fprintf (print.outf, "%s %s", space, name);
-+ else
-+ fprintf (print.outf, "%s", name);
-+ print.printed = 1;
-+ }
-+ else if (token->type == CPP_PRAGMA_EOL)
-+ maybe_print_line (token->src_loc);
-+ else
-+ cpp_output_token (token, print.outf);
-
- if (token->type == CPP_COMMENT)
- account_for_newlines (token->val.str.text, token->val.str.len);
---- gcc/c-pragma.c.jj 2008-02-15 18:43:03.000000000 +0100
-+++ gcc/c-pragma.c 2008-02-26 22:59:44.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Handle #pragma, system V.4 style. Supports #pragma weak and #pragma pack.
- Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-- 2006, 2007 Free Software Foundation, Inc.
-+ 2006, 2007, 2008 Free Software Foundation, Inc.
-
- This file is part of GCC.
-
-@@ -872,6 +872,61 @@ DEF_VEC_ALLOC_O (pragma_handler, heap);
-
- static VEC(pragma_handler, heap) *registered_pragmas;
-
-+typedef struct
-+{
-+ const char *space;
-+ const char *name;
-+} pragma_ns_name;
-+
-+DEF_VEC_O (pragma_ns_name);
-+DEF_VEC_ALLOC_O (pragma_ns_name, heap);
-+
-+static VEC(pragma_ns_name, heap) *registered_pp_pragmas;
-+
-+struct omp_pragma_def { const char *name; unsigned int id; };
-+static const struct omp_pragma_def omp_pragmas[] = {
-+ { "atomic", PRAGMA_OMP_ATOMIC },
-+ { "barrier", PRAGMA_OMP_BARRIER },
-+ { "critical", PRAGMA_OMP_CRITICAL },
-+ { "flush", PRAGMA_OMP_FLUSH },
-+ { "for", PRAGMA_OMP_FOR },
-+ { "master", PRAGMA_OMP_MASTER },
-+ { "ordered", PRAGMA_OMP_ORDERED },
-+ { "parallel", PRAGMA_OMP_PARALLEL },
-+ { "section", PRAGMA_OMP_SECTION },
-+ { "sections", PRAGMA_OMP_SECTIONS },
-+ { "single", PRAGMA_OMP_SINGLE },
-+ { "threadprivate", PRAGMA_OMP_THREADPRIVATE }
-+};
-+
-+void
-+c_pp_lookup_pragma (unsigned int id, const char **space, const char **name)
-+{
-+ const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
-+ int i;
-+
-+ for (i = 0; i < n_omp_pragmas; ++i)
-+ if (omp_pragmas[i].id == id)
-+ {
-+ *space = "omp";
-+ *name = omp_pragmas[i].name;
-+ return;
-+ }
-+
-+ if (id >= PRAGMA_FIRST_EXTERNAL
-+ && (id < PRAGMA_FIRST_EXTERNAL
-+ + VEC_length (pragma_ns_name, registered_pp_pragmas)))
-+ {
-+ *space = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+ id - PRAGMA_FIRST_EXTERNAL)->space;
-+ *name = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+ id - PRAGMA_FIRST_EXTERNAL)->name;
-+ return;
-+ }
-+
-+ gcc_unreachable ();
-+}
-+
- /* Front-end wrappers for pragma registration to avoid dragging
- cpplib.h in almost everywhere. */
-
-@@ -881,13 +936,29 @@ c_register_pragma_1 (const char *space,
- {
- unsigned id;
-
-- VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
-- id = VEC_length (pragma_handler, registered_pragmas);
-- id += PRAGMA_FIRST_EXTERNAL - 1;
--
-- /* The C++ front end allocates 6 bits in cp_token; the C front end
-- allocates 7 bits in c_token. At present this is sufficient. */
-- gcc_assert (id < 64);
-+ if (flag_preprocess_only)
-+ {
-+ pragma_ns_name ns_name;
-+
-+ if (!allow_expansion)
-+ return;
-+
-+ ns_name.space = space;
-+ ns_name.name = name;
-+ VEC_safe_push (pragma_ns_name, heap, registered_pp_pragmas, &ns_name);
-+ id = VEC_length (pragma_ns_name, registered_pp_pragmas);
-+ id += PRAGMA_FIRST_EXTERNAL - 1;
-+ }
-+ else
-+ {
-+ VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
-+ id = VEC_length (pragma_handler, registered_pragmas);
-+ id += PRAGMA_FIRST_EXTERNAL - 1;
-+
-+ /* The C++ front end allocates 6 bits in cp_token; the C front end
-+ allocates 7 bits in c_token. At present this is sufficient. */
-+ gcc_assert (id < 64);
-+ }
-
- cpp_register_deferred_pragma (parse_in, space, name, id,
- allow_expansion, false);
-@@ -921,24 +992,8 @@ c_invoke_pragma_handler (unsigned int id
- void
- init_pragma (void)
- {
-- if (flag_openmp && !flag_preprocess_only)
-+ if (flag_openmp)
- {
-- struct omp_pragma_def { const char *name; unsigned int id; };
-- static const struct omp_pragma_def omp_pragmas[] = {
-- { "atomic", PRAGMA_OMP_ATOMIC },
-- { "barrier", PRAGMA_OMP_BARRIER },
-- { "critical", PRAGMA_OMP_CRITICAL },
-- { "flush", PRAGMA_OMP_FLUSH },
-- { "for", PRAGMA_OMP_FOR },
-- { "master", PRAGMA_OMP_MASTER },
-- { "ordered", PRAGMA_OMP_ORDERED },
-- { "parallel", PRAGMA_OMP_PARALLEL },
-- { "section", PRAGMA_OMP_SECTION },
-- { "sections", PRAGMA_OMP_SECTIONS },
-- { "single", PRAGMA_OMP_SINGLE },
-- { "threadprivate", PRAGMA_OMP_THREADPRIVATE }
-- };
--
- const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
- int i;
-
-@@ -947,8 +1002,9 @@ init_pragma (void)
- omp_pragmas[i].id, true, true);
- }
-
-- cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
-- PRAGMA_GCC_PCH_PREPROCESS, false, false);
-+ if (!flag_preprocess_only)
-+ cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
-+ PRAGMA_GCC_PCH_PREPROCESS, false, false);
-
- #ifdef HANDLE_PRAGMA_PACK
- #ifdef HANDLE_PRAGMA_PACK_WITH_EXPANSION
---- gcc/c-opts.c.jj 2008-02-26 22:53:23.000000000 +0100
-+++ gcc/c-opts.c 2008-02-26 22:54:57.000000000 +0100
-@@ -1,5 +1,5 @@
- /* C/ObjC/C++ command line option handling.
-- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
- Free Software Foundation, Inc.
- Contributed by Neil Booth.
-
-@@ -1239,6 +1239,9 @@ c_common_init (void)
- if (version_flag)
- c_common_print_pch_checksum (stderr);
-
-+ /* Has to wait until now so that cpplib has its hash table. */
-+ init_pragma ();
-+
- if (flag_preprocess_only)
- {
- finish_options ();
-@@ -1246,9 +1249,6 @@ c_common_init (void)
- return false;
- }
-
-- /* Has to wait until now so that cpplib has its hash table. */
-- init_pragma ();
--
- return true;
- }
-
---- gcc/c-pragma.h.jj 2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-pragma.h 2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Pragma related interfaces.
- Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-- 2007 Free Software Foundation, Inc.
-+ 2007, 2008 Free Software Foundation, Inc.
-
- This file is part of GCC.
-
-@@ -124,4 +124,6 @@ extern enum cpp_ttype pragma_lex (tree *
- extern enum cpp_ttype c_lex_with_flags (tree *, location_t *, unsigned char *,
- int);
-
-+extern void c_pp_lookup_pragma (unsigned int, const char **, const char **);
-+
- #endif /* GCC_C_PRAGMA_H */
---- gcc/config/darwin.h.jj 2008-02-11 14:48:12.000000000 +0100
-+++ gcc/config/darwin.h 2008-02-26 22:54:57.000000000 +0100
-@@ -892,8 +892,9 @@ enum machopic_addr_class {
-
- #define DARWIN_REGISTER_TARGET_PRAGMAS() \
- do { \
-- cpp_register_pragma (parse_in, NULL, "mark", \
-- darwin_pragma_ignore, false); \
-+ if (!flag_preprocess_only) \
-+ cpp_register_pragma (parse_in, NULL, "mark", \
-+ darwin_pragma_ignore, false); \
- c_register_pragma (0, "options", darwin_pragma_options); \
- c_register_pragma (0, "segment", darwin_pragma_ignore); \
- c_register_pragma (0, "unused", darwin_pragma_unused); \
---- gcc/testsuite/gcc.dg/gomp/preprocess-1.c.jj 2008-02-26 22:54:57.000000000 +0100
-+++ gcc/testsuite/gcc.dg/gomp/preprocess-1.c 2008-02-26 22:54:57.000000000 +0100
-@@ -0,0 +1,16 @@
-+/* { dg-do preprocess } */
-+
-+void foo (void)
-+{
-+ int i1, j1, k1;
-+#define p parallel
-+#define P(x) private (x##1)
-+#define S(x) shared (x##1)
-+#define F(x) firstprivate (x##1)
-+#pragma omp p P(i) \
-+ S(j) \
-+ F(k)
-+ ;
-+}
-+
-+/* { dg-final { scan-file preprocess-1.i "(^|\n)#pragma omp parallel private \\(i1\\) shared \\(j1\\) firstprivate \\(k1\\)($|\n)" } } */
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch
deleted file mode 100644
index a588db28e..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Build i386.rpm libgomp and libsupc++.a(guard.o) as i486+, pre-i486
-hardware isn't supported because NPTL doesn't support it anyway.
-
-Index: libgomp/configure.tgt
-===================================================================
---- libgomp/configure.tgt.orig 2010-01-28 13:47:59.000000000 -0800
-+++ libgomp/configure.tgt 2010-06-25 10:32:26.706135558 -0700
-@@ -48,14 +48,14 @@
- ;;
-
- # Note that bare i386 is not included here. We need cmpxchg.
-- i[456]86-*-linux*)
-+ i[3456]86-*-linux*)
- config_path="linux/x86 linux posix"
- case " ${CC} ${CFLAGS} " in
- *" -m64 "*)
- ;;
- *)
- if test -z "$with_arch"; then
-- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
-+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
- fi
- esac
- ;;
-@@ -67,7 +67,7 @@
- config_path="linux/x86 linux posix"
- case " ${CC} ${CFLAGS} " in
- *" -m32 "*)
-- XCFLAGS="${XCFLAGS} -march=i486 -mtune=i686"
-+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
- ;;
- esac
- ;;
-Index: libstdc++-v3/libsupc++/guard.cc
-===================================================================
---- libstdc++-v3/libsupc++/guard.cc.orig 2009-11-09 14:09:30.000000000 -0800
-+++ libstdc++-v3/libsupc++/guard.cc 2010-06-25 10:32:26.710135964 -0700
-@@ -30,6 +30,27 @@
- #include <new>
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
-+#if defined __i386__ && !defined _GLIBCXX_ATOMIC_BUILTINS
-+# define _GLIBCXX_ATOMIC_BUILTINS 1
-+# define __sync_val_compare_and_swap(a, b, c) \
-+ ({ \
-+ typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1]; \
-+ int sltas; \
-+ __asm __volatile ("lock; cmpxchgl %3, (%1)" \
-+ : "=a" (sltas) \
-+ : "r" (a), "0" (b), "r" (c) : "memory"); \
-+ sltas; \
-+ })
-+# define __sync_lock_test_and_set(a, b) \
-+ ({ \
-+ typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1]; \
-+ int sltas; \
-+ __asm __volatile ("xchgl (%1), %0" \
-+ : "=r" (sltas) \
-+ : "r" (a), "0" (b) : "memory"); \
-+ sltas; \
-+ })
-+#endif
- #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
- && defined(_GLIBCXX_ATOMIC_BUILTINS_4) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
- # include <climits>
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch
deleted file mode 100644
index cad13d122..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch
+++ /dev/null
@@ -1,550 +0,0 @@
-2004-11-27 Jakub Jelinek <jakub@redhat.com>
-
- * config.gcc (ia64*-*-linux*): If native and libelf is installed,
- use ia64/t-glibc-no-libunwind instead of the other t-*unwind*
- fragments.
- * config/ia64/t-glibc-no-libunwind: New file.
- * config/ia64/change-symver.c: New file.
- * config/ia64/unwind-ia64.c: If USE_SYMVER_GLOBAL and SHARED,
- define _Unwind_* to __symverglobal_Unwind_*.
- (alias): Undefine.
- (symverglobal): Define. Use it on _Unwind_*.
- * config/ia64/mkmap-symver-multi.awk: New file.
- * config/ia64/libgcc-ia64-no-libunwind.ver: New file.
-
-Index: gcc/config.gcc
-===================================================================
---- gcc/config.gcc.orig 2010-04-07 03:34:00.000000000 -0700
-+++ gcc/config.gcc 2010-06-25 10:15:25.133131055 -0700
-@@ -1457,9 +1457,16 @@
- ;;
- ia64*-*-linux*)
- tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
-- tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
-- if test x$with_system_libunwind != xyes ; then
-- tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
-+ tmake_file="${tmake_file} ia64/t-ia64"
-+ if test x${target} = x${host} && test x${target} = x${build} \
-+ && grep gelf_getverdef /usr/include/gelf.h > /dev/null 2>&1 \
-+ && test -f /usr/lib/libelf.so; then
-+ tmake_file="${tmake_file} ia64/t-glibc-no-libunwind"
-+ else
-+ tmake_file="${tmake_file} t-libunwind ia64/t-glibc"
-+ if test x$with_system_libunwind != xyes ; then
-+ tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
-+ fi
- fi
- target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-Index: gcc/config/ia64/t-glibc-no-libunwind
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/config/ia64/t-glibc-no-libunwind 2010-06-25 10:14:32.521880765 -0700
-@@ -0,0 +1,30 @@
-+# Don't use system libunwind library on IA-64 GLIBC based system,
-+# but make _Unwind_* symbols unversioned, so that created programs
-+# are usable even when libgcc_s uses libunwind.
-+LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c
-+SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64-no-libunwind.ver
-+SHLIB_MKMAP = $(srcdir)/config/ia64/mkmap-symver-multi.awk
-+
-+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-+ -Wl,--soname=$(SHLIB_SONAME) \
-+ -Wl,--version-script=$(SHLIB_MAP) \
-+ -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
-+ rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
-+ if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \
-+ mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \
-+ $(SHLIB_DIR)/$(SHLIB_SONAME).backup; \
-+ else true; fi && \
-+ gcc -O2 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tweak \
-+ $$(gcc_srcdir)/config/ia64/change-symver.c -lelf && \
-+ $(SHLIB_DIR)/$(SHLIB_SONAME).tweak $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \
-+ GCC_3.4.2 _GLOBAL_ \
-+ _Unwind_GetGR _Unwind_RaiseException _Unwind_GetRegionStart _Unwind_SetIP \
-+ _Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_Resume \
-+ _Unwind_DeleteException _Unwind_SetGR _Unwind_ForcedUnwind \
-+ _Unwind_Backtrace _Unwind_FindEnclosingFunction _Unwind_GetCFA \
-+ _Unwind_Resume_or_Rethrow _Unwind_GetBSP && \
-+ rm -f $(SHLIB_DIR)/$(SHLIB_SONAME).tweak && \
-+ mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \
-+ $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
-+
-+TARGET_LIBGCC2_CFLAGS += -DUSE_SYMVER_GLOBAL
-Index: gcc/config/ia64/change-symver.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/config/ia64/change-symver.c 2010-06-25 10:14:32.521880765 -0700
-@@ -0,0 +1,211 @@
-+#define _GNU_SOURCE 1
-+#define _FILE_OFFSET_BITS 64
-+#include <endian.h>
-+#include <errno.h>
-+#include <error.h>
-+#include <fcntl.h>
-+#include <fnmatch.h>
-+#include <gelf.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+int
-+compute_veridx (const char *name, Elf *elf, Elf_Data *verd, GElf_Shdr *verd_shdr)
-+{
-+ if (strcmp (name, "_GLOBAL_") == 0)
-+ return 1;
-+
-+ int cnt;
-+ size_t offset = 0;
-+ for (cnt = verd_shdr->sh_info; --cnt >= 0; )
-+ {
-+ GElf_Verdef defmem;
-+ GElf_Verdef *def;
-+ GElf_Verdaux auxmem;
-+ GElf_Verdaux *aux;
-+ unsigned int auxoffset;
-+
-+ /* Get the data at the next offset. */
-+ def = gelf_getverdef (verd, offset, &defmem);
-+ if (def == NULL)
-+ break;
-+
-+ auxoffset = offset + def->vd_aux;
-+ aux = gelf_getverdaux (verd, auxoffset, &auxmem);
-+ if (aux == NULL)
-+ break;
-+
-+ if (strcmp (name, elf_strptr (elf, verd_shdr->sh_link,
-+ aux->vda_name)) == 0)
-+ return def->vd_ndx;
-+
-+ /* Find the next offset. */
-+ offset += def->vd_next;
-+ }
-+
-+ return -1;
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ if (argc < 4)
-+ error (1, 0, "Usage: change_symver library from_symver to_symver symbol...\nExample: change_symver libfoo.so FOO_1.0 *global* bar baz");
-+
-+ const char *fname = argv[1];
-+
-+ /* Open the file. */
-+ int fd;
-+ fd = open (fname, O_RDWR);
-+ if (fd == -1)
-+ error (1, errno, fname);
-+
-+ elf_version (EV_CURRENT);
-+
-+ /* Now get the ELF descriptor. */
-+ Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
-+ if (elf == NULL || elf_kind (elf) != ELF_K_ELF)
-+ error (1, 0, "Couldn't open %s: %s", fname, elf_errmsg (-1));
-+
-+ size_t shstrndx;
-+ /* Get the section header string table index. */
-+ if (elf_getshstrndx (elf, &shstrndx) < 0)
-+ error (1, 0, "cannot get shstrndx from %s", fname);
-+
-+ GElf_Ehdr ehdr_mem;
-+ GElf_Ehdr *ehdr;
-+
-+ /* We need the ELF header in a few places. */
-+ ehdr = gelf_getehdr (elf, &ehdr_mem);
-+ if (ehdr == NULL)
-+ error (1, 0, "couldn't get ELF headers %s: %s", fname, elf_errmsg (-1));
-+
-+ Elf_Scn *scn = NULL;
-+ GElf_Shdr shdr_mem, verd_shdr, ver_shdr, dynsym_shdr;
-+ Elf_Data *ver = NULL, *verd = NULL, *dynsym = NULL;
-+
-+ while ((scn = elf_nextscn (elf, scn)) != NULL)
-+ {
-+ GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
-+
-+ if (shdr == NULL)
-+ error (1, 0, "couldn't get shdr from %s", fname);
-+
-+ if ((shdr->sh_flags & SHF_ALLOC) != 0)
-+ {
-+ const char *name = elf_strptr (elf, shstrndx, shdr->sh_name);
-+ Elf_Data **p;
-+
-+ if (strcmp (name, ".gnu.version") == 0)
-+ {
-+ p = &ver;
-+ ver_shdr = *shdr;
-+ }
-+ else if (strcmp (name, ".gnu.version_d") == 0)
-+ {
-+ p = &verd;
-+ verd_shdr = *shdr;
-+ }
-+ else if (strcmp (name, ".dynsym") == 0)
-+ {
-+ p = &dynsym;
-+ dynsym_shdr = *shdr;
-+ }
-+ else
-+ continue;
-+
-+ if (*p != NULL)
-+ error (1, 0, "Two %s sections in %s", name, fname);
-+ *p = elf_getdata (scn, NULL);
-+ if (*p == NULL || elf_getdata (scn, *p) != NULL)
-+ error (1, 0, "No data or non-contiguous data in %s section in %s",
-+ name, fname);
-+ }
-+ }
-+
-+ if (ver == NULL || verd == NULL || dynsym == NULL)
-+ error (1, 0, "Couldn't find one of the needed sections in %s", fname);
-+
-+ int from_idx = compute_veridx (argv[2], elf, verd, &verd_shdr);
-+ if (from_idx == -1)
-+ error (1, 0, "Could not find symbol version %s in %s", argv[2], fname);
-+
-+ int to_idx = compute_veridx (argv[3], elf, verd, &verd_shdr);
-+ if (to_idx == -1)
-+ error (1, 0, "Could not find symbol version %s in %s", argv[3], fname);
-+
-+ if (dynsym_shdr.sh_entsize != gelf_fsize (elf, ELF_T_SYM, 1, ehdr->e_version)
-+ || dynsym_shdr.sh_size % dynsym_shdr.sh_entsize
-+ || ver_shdr.sh_entsize != 2
-+ || (ver_shdr.sh_size & 1)
-+ || dynsym_shdr.sh_size / dynsym_shdr.sh_entsize != ver_shdr.sh_size / 2)
-+ error (1, 0, "Unexpected sh_size or sh_entsize in %s", fname);
-+
-+ size_t nentries = ver_shdr.sh_size / 2;
-+ size_t cnt;
-+ GElf_Versym array[nentries];
-+ for (cnt = 0; cnt < nentries; ++cnt)
-+ {
-+ GElf_Versym vsymmem;
-+ GElf_Versym *vsym;
-+
-+ vsym = gelf_getversym (ver, cnt, &vsymmem);
-+ if (vsym == NULL)
-+ error (1, 0, "gelt_getversym failed in %s: %s", fname, elf_errmsg (-1));
-+
-+ array[cnt] = *vsym;
-+ if (*vsym != from_idx)
-+ continue;
-+
-+ GElf_Sym sym_mem;
-+ GElf_Sym *sym;
-+ sym = gelf_getsym (dynsym, cnt, &sym_mem);
-+ if (sym == NULL)
-+ error (1, 0, "gelt_getsym failed in %s: %s", fname, elf_errmsg (-1));
-+
-+ const char *name = elf_strptr (elf, dynsym_shdr.sh_link, sym->st_name);
-+
-+ int argn;
-+ for (argn = 4; argn < argc; ++argn)
-+ if (fnmatch (argv[argn], name, 0) == 0)
-+ {
-+ array[cnt] = to_idx;
-+ break;
-+ }
-+ }
-+
-+ if (sizeof (array[0]) != 2)
-+ abort ();
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+ if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
-+ ;
-+ else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+ if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
-+ ;
-+ else if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
-+#else
-+# error Unsupported endianity
-+#endif
-+ {
-+ for (cnt = 0; cnt < nentries; ++cnt)
-+ array[cnt] = ((array[cnt] & 0xff) << 8) | ((array[cnt] & 0xff00) >> 8);
-+ }
-+ else
-+ error (1, 0, "Unknown EI_DATA %d in %s", ehdr->e_ident[EI_DATA], fname);
-+
-+ if (elf_end (elf) != 0)
-+ error (1, 0, "couldn't close %s: %s", fname, elf_errmsg (-1));
-+
-+ if (lseek (fd, ver_shdr.sh_offset, SEEK_SET) != (off_t) ver_shdr.sh_offset)
-+ error (1, 0, "failed to seek to %zd in %s", (size_t) ver_shdr.sh_offset,
-+ fname);
-+
-+ if (write (fd, array, 2 * nentries) != (ssize_t) (2 * nentries))
-+ error (1, 0, "failed to write .gnu.version section into %s", fname);
-+
-+ close (fd);
-+ return 0;
-+}
-Index: gcc/config/ia64/unwind-ia64.c
-===================================================================
---- gcc/config/ia64/unwind-ia64.c.orig 2009-09-07 08:41:52.000000000 -0700
-+++ gcc/config/ia64/unwind-ia64.c 2010-06-25 10:14:32.521880765 -0700
-@@ -48,6 +48,51 @@
- #define MD_UNW_COMPATIBLE_PERSONALITY_P(HEADER) 1
- #endif
-
-+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
-+extern _Unwind_Reason_Code __symverglobal_Unwind_Backtrace
-+ (_Unwind_Trace_Fn, void *);
-+extern void __symverglobal_Unwind_DeleteException
-+ (struct _Unwind_Exception *);
-+extern void * __symverglobal_Unwind_FindEnclosingFunction (void *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_ForcedUnwind
-+ (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
-+extern _Unwind_Word __symverglobal_Unwind_GetCFA
-+ (struct _Unwind_Context *);
-+extern _Unwind_Word __symverglobal_Unwind_GetBSP
-+ (struct _Unwind_Context *);
-+extern _Unwind_Word __symverglobal_Unwind_GetGR
-+ (struct _Unwind_Context *, int );
-+extern _Unwind_Ptr __symverglobal_Unwind_GetIP (struct _Unwind_Context *);
-+extern void *__symverglobal_Unwind_GetLanguageSpecificData
-+ (struct _Unwind_Context *);
-+extern _Unwind_Ptr __symverglobal_Unwind_GetRegionStart
-+ (struct _Unwind_Context *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_RaiseException
-+ (struct _Unwind_Exception *);
-+extern void __symverglobal_Unwind_Resume (struct _Unwind_Exception *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_Resume_or_Rethrow
-+ (struct _Unwind_Exception *);
-+extern void __symverglobal_Unwind_SetGR
-+ (struct _Unwind_Context *, int, _Unwind_Word);
-+extern void __symverglobal_Unwind_SetIP
-+ (struct _Unwind_Context *, _Unwind_Ptr);
-+#define _Unwind_Backtrace __symverglobal_Unwind_Backtrace
-+#define _Unwind_DeleteException __symverglobal_Unwind_DeleteException
-+#define _Unwind_FindEnclosingFunction __symverglobal_Unwind_FindEnclosingFunction
-+#define _Unwind_ForcedUnwind __symverglobal_Unwind_ForcedUnwind
-+#define _Unwind_GetBSP __symverglobal_Unwind_GetBSP
-+#define _Unwind_GetCFA __symverglobal_Unwind_GetCFA
-+#define _Unwind_GetGR __symverglobal_Unwind_GetGR
-+#define _Unwind_GetIP __symverglobal_Unwind_GetIP
-+#define _Unwind_GetLanguageSpecificData __symverglobal_Unwind_GetLanguageSpecificData
-+#define _Unwind_GetRegionStart __symverglobal_Unwind_GetRegionStart
-+#define _Unwind_RaiseException __symverglobal_Unwind_RaiseException
-+#define _Unwind_Resume __symverglobal_Unwind_Resume
-+#define _Unwind_Resume_or_Rethrow __symverglobal_Unwind_Resume_or_Rethrow
-+#define _Unwind_SetGR __symverglobal_Unwind_SetGR
-+#define _Unwind_SetIP __symverglobal_Unwind_SetIP
-+#endif
-+
- enum unw_application_register
- {
- UNW_AR_BSP,
-@@ -2457,4 +2502,44 @@
- alias (_Unwind_SetIP);
- #endif
-
-+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
-+#undef alias
-+#define symverglobal(name, version) \
-+__typeof (__symverglobal##name) __symverlocal##name \
-+ __attribute__ ((alias ("__symverglobal" #name))); \
-+__asm__ (".symver __symverglobal" #name"," #name "@@GCC_3.4.2");\
-+__asm__ (".symver __symverlocal" #name"," #name "@" #version)
-+
-+#undef _Unwind_Backtrace
-+#undef _Unwind_DeleteException
-+#undef _Unwind_FindEnclosingFunction
-+#undef _Unwind_ForcedUnwind
-+#undef _Unwind_GetBSP
-+#undef _Unwind_GetCFA
-+#undef _Unwind_GetGR
-+#undef _Unwind_GetIP
-+#undef _Unwind_GetLanguageSpecificData
-+#undef _Unwind_GetRegionStart
-+#undef _Unwind_RaiseException
-+#undef _Unwind_Resume
-+#undef _Unwind_Resume_or_Rethrow
-+#undef _Unwind_SetGR
-+#undef _Unwind_SetIP
-+symverglobal (_Unwind_Backtrace, GCC_3.3);
-+symverglobal (_Unwind_DeleteException, GCC_3.0);
-+symverglobal (_Unwind_FindEnclosingFunction, GCC_3.3);
-+symverglobal (_Unwind_ForcedUnwind, GCC_3.0);
-+symverglobal (_Unwind_GetBSP, GCC_3.3.2);
-+symverglobal (_Unwind_GetCFA, GCC_3.3);
-+symverglobal (_Unwind_GetGR, GCC_3.0);
-+symverglobal (_Unwind_GetIP, GCC_3.0);
-+symverglobal (_Unwind_GetLanguageSpecificData, GCC_3.0);
-+symverglobal (_Unwind_GetRegionStart, GCC_3.0);
-+symverglobal (_Unwind_RaiseException, GCC_3.0);
-+symverglobal (_Unwind_Resume, GCC_3.0);
-+symverglobal (_Unwind_Resume_or_Rethrow, GCC_3.3);
-+symverglobal (_Unwind_SetGR, GCC_3.0);
-+symverglobal (_Unwind_SetIP, GCC_3.0);
-+#endif
-+
- #endif
-Index: gcc/config/ia64/mkmap-symver-multi.awk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/config/ia64/mkmap-symver-multi.awk 2010-06-25 10:14:32.521880765 -0700
-@@ -0,0 +1,133 @@
-+# Generate an ELF symbol version map a-la Solaris and GNU ld.
-+# Contributed by Richard Henderson <rth@cygnus.com>
-+#
-+# 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, 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+BEGIN {
-+ state = "nm";
-+ sawsymbol = 0;
-+}
-+
-+# Remove comment and blank lines.
-+/^ *#/ || /^ *$/ {
-+ next;
-+}
-+
-+# We begin with nm input. Collect the set of symbols that are present
-+# so that we can not emit them into the final version script -- Solaris
-+# complains at us if we do.
-+
-+state == "nm" && /^%%/ {
-+ state = "ver";
-+ next;
-+}
-+
-+state == "nm" && ($1 == "U" || $2 == "U") {
-+ next;
-+}
-+
-+state == "nm" && NF == 3 {
-+ if ($3 ~ /^[^@]*@GCC_[0-9.]*$/) {
-+ def[$3] = 1
-+ tl=$3
-+ sub(/^.*@/,"",tl)
-+ ver[$3] = tl
-+ } else {
-+ sub(/@@?GCC_[0-9.]*$/,"",$3)
-+ def[$3] = 1;
-+ }
-+ sawsymbol = 1;
-+ next;
-+}
-+
-+state == "nm" {
-+ next;
-+}
-+
-+# Now we process a simplified variant of the Solaris symbol version
-+# script. We have one symbol per line, no semicolons, simple markers
-+# for beginning and ending each section, and %inherit markers for
-+# describing version inheritence. A symbol may appear in more than
-+# one symbol version, and the last seen takes effect.
-+
-+NF == 3 && $1 == "%inherit" {
-+ inherit[$2] = $3;
-+ next;
-+}
-+
-+NF == 2 && $2 == "{" {
-+ libs[$1] = 1;
-+ thislib = $1;
-+ next;
-+}
-+
-+$1 == "}" {
-+ thislib = "";
-+ next;
-+}
-+
-+{
-+ ver[$1] = thislib;
-+ next;
-+}
-+
-+END {
-+ if (!sawsymbol)
-+ {
-+ print "No symbols seen -- broken or mis-installed nm?" | "cat 1>&2";
-+ exit 1;
-+ }
-+ for (l in libs)
-+ output(l);
-+}
-+
-+function output(lib) {
-+ if (done[lib])
-+ return;
-+ done[lib] = 1;
-+ if (inherit[lib])
-+ output(inherit[lib]);
-+
-+ empty=1
-+ for (sym in ver)
-+ if ((ver[sym] == lib) && (sym in def))
-+ {
-+ if (empty)
-+ {
-+ printf("%s {\n", lib);
-+ printf(" global:\n");
-+ empty = 0;
-+ }
-+ symp = sym;
-+ sub(/@GCC_[0-9.]*$/,"",symp);
-+ printf("\t%s;\n", symp);
-+ if (dotsyms)
-+ printf("\t.%s;\n", symp);
-+ }
-+
-+ if (empty)
-+ {
-+ for (l in libs)
-+ if (inherit[l] == lib)
-+ inherit[l] = inherit[lib];
-+ }
-+ else if (inherit[lib])
-+ printf("} %s;\n", inherit[lib]);
-+ else
-+ printf ("\n local:\n\t*;\n};\n");
-+}
-Index: gcc/config/ia64/libgcc-ia64-no-libunwind.ver
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/config/ia64/libgcc-ia64-no-libunwind.ver 2010-06-25 10:14:32.525880902 -0700
-@@ -0,0 +1,17 @@
-+GCC_3.4.2 {
-+ _Unwind_GetGR
-+ _Unwind_RaiseException
-+ _Unwind_GetRegionStart
-+ _Unwind_SetIP
-+ _Unwind_GetIP
-+ _Unwind_GetLanguageSpecificData
-+ _Unwind_Resume
-+ _Unwind_DeleteException
-+ _Unwind_SetGR
-+ _Unwind_ForcedUnwind
-+ _Unwind_Backtrace
-+ _Unwind_FindEnclosingFunction
-+ _Unwind_GetCFA
-+ _Unwind_Resume_or_Rethrow
-+ _Unwind_GetBSP
-+}
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch
deleted file mode 100644
index de14a5001..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2008-01-25 Jakub Jelinek <jakub@redhat.com>
-
- * lang.c (java_classify_record): Revert 2007-12-20 change.
-
-Index: gcc/java/lang.c
-===================================================================
---- gcc/java/lang.c.orig 2010-01-20 00:17:00.000000000 -0800
-+++ gcc/java/lang.c 2010-06-25 10:28:46.569383189 -0700
-@@ -881,9 +881,7 @@
- if (! CLASS_P (type))
- return RECORD_IS_STRUCT;
-
-- /* ??? GDB does not support DW_TAG_interface_type as of December,
-- 2007. Re-enable this at a later time. */
-- if (0 && CLASS_INTERFACE (TYPE_NAME (type)))
-+ if (CLASS_INTERFACE (TYPE_NAME (type)))
- return RECORD_IS_INTERFACE;
-
- return RECORD_IS_CLASS;
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch
deleted file mode 100644
index 3cb10f3c2..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: libjava/configure.ac
-===================================================================
---- libjava/configure.ac.orig 2010-03-21 12:41:37.000000000 -0700
-+++ libjava/configure.ac 2010-06-25 10:17:47.489886278 -0700
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
-Index: libjava/configure
-===================================================================
---- libjava/configure.orig 2010-04-02 11:18:06.000000000 -0700
-+++ libjava/configure 2010-06-25 10:17:47.516381209 -0700
-@@ -1609,6 +1609,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --enable-maintainer-mode enable make rules and dependencies not useful
-@@ -3346,6 +3348,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch
deleted file mode 100644
index da85e556e..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch
+++ /dev/null
@@ -1,2797 +0,0 @@
-2008-03-28 Jakub Jelinek <jakub@redhat.com>
-
- * config/linux/sparc/futex.h (atomic_write_barrier): Fix membar
- argument.
-
-2008-03-27 Jakub Jelinek <jakub@redhat.com>
-
- * libgomp.h (struct gomp_team_state): Remove single_count field
- ifndef HAVE_SYNC_BUILTINS.
- (struct gomp_team): Likewise. Add work_share_list_free_lock
- ifndef HAVE_SYNC_BUILTINS.
- * team.c (gomp_new_team): If HAVE_SYNC_BUILTINS is not defined,
- don't initialize single_count, but instead initialize
- work_share_list_free_lock.
- (free_team): Destroy work_share_list_free_lock ifndef
- HAVE_SYNC_BUILTINS.
- (gomp_team_start): Don't initialize ts.single_count ifndef
- HAVE_SYNC_BUILTINS.
- * work.c (alloc_work_share, free_work_share): Use
- work_share_list_free_lock instead of atomic chaining ifndef
- HAVE_SYNC_BUILTINS.
-
-2008-03-26 Jakub Jelinek <jakub@redhat.com>
-
- * loop.c (gomp_loop_init): Fix GFS_DYNAMIC ws->mode setting.
- * testsuite/libgomp.c/loop-4.c: New test.
-
- * libgomp.h (struct gomp_team_state): Add single_count field.
- (struct gomp_team): Likewise.
- * team.c (gomp_new_team): Clear single_count.
- (gomp_team_start): Likewise.
- * single.c (GOMP_single_start): Rewritten if HAVE_SYNC_BUILTINS.
-
-2008-03-25 Jakub Jelinek <jakub@redhat.com>
-
- * team.c (gomp_thread_start): Don't clear ts.static_trip here.
- * loop.c (gomp_loop_static_start, gomp_loop_dynamic_start): Clear
- ts.static_trip here.
- * work.c (gomp_work_share_start): Don't clear ts.static_trip here.
-
-2008-03-21 Jakub Jelinek <jakub@redhat.com>
-
- * libgomp.h: Include ptrlock.h.
- (struct gomp_work_share): Reshuffle fields. Add next_alloc,
- next_ws, next_free and inline_ordered_team_ids fields, change
- ordered_team_ids into pointer from flexible array member.
- (struct gomp_team_state): Add last_work_share field, remove
- work_share_generation.
- (struct gomp_team): Remove work_share_lock, generation_mask,
- oldest_live_gen, num_live_gen and init_work_shares fields, add
- work work_share_list_alloc, work_share_list_free and work_share_chunk
- fields. Change work_shares from pointer to pointers into an array.
- (gomp_new_team): New prototype.
- (gomp_team_start): Change type of last argument.
- (gomp_new_work_share): Removed.
- (gomp_init_work_share, gomp_fini_work_share): New prototypes.
- (gomp_work_share_init_done): New static inline.
- * team.c (gomp_thread_start): Clear ts.last_work_share, don't clear
- ts.work_share_generation.
- (new_team): Removed.
- (gomp_new_team): New function.
- (free_team): Free gomp_work_share blocks chained through next_alloc,
- instead of freeing work_shares and destroying work_share_lock.
- (gomp_team_start): Change last argument from ws to team, don't create
- new team, set ts.work_share to &team->work_shares[0] and clear
- ts.last_work_share. Don't clear ts.work_share_generation.
- (gomp_team_end): Call gomp_fini_work_share.
- * work.c (gomp_new_work_share): Removed.
- (alloc_work_share, gomp_init_work_share, gomp_fini_work_share): New
- functions.
- (free_work_share): Add team argument. Call gomp_fini_work_share
- and then either free ws if orphaned, or put it into
- work_share_list_free list of the current team.
- (gomp_work_share_start, gomp_work_share_end,
- gomp_work_share_end_nowait): Rewritten.
- * sections.c (GOMP_sections_start): Call gomp_work_share_init_done
- after gomp_sections_init. If HAVE_SYNC_BUILTINS, call
- gomp_iter_dynamic_next instead of the _locked variant and don't take
- lock around it, otherwise acquire it before calling
- gomp_iter_dynamic_next_locked.
- (GOMP_sections_next): If HAVE_SYNC_BUILTINS, call
- gomp_iter_dynamic_next instead of the _locked variant and don't take
- lock around it.
- (GOMP_parallel_sections_start): Call gomp_new_team instead of
- gomp_new_work_share. Call gomp_sections_init on &team->work_shares[0].
- Adjust gomp_team_start caller.
- * loop.c (gomp_loop_static_start, gomp_loop_ordered_static_start): Call
- gomp_work_share_init_done after gomp_loop_init. Don't unlock ws->lock.
- (gomp_loop_dynamic_start, gomp_loop_guided_start): Call
- gomp_work_share_init_done after gomp_loop_init. If HAVE_SYNC_BUILTINS,
- don't unlock ws->lock, otherwise lock it.
- (gomp_loop_ordered_dynamic_start, gomp_loop_ordered_guided_start): Call
- gomp_work_share_init_done after gomp_loop_init. Lock ws->lock.
- (gomp_parallel_loop_start): Call gomp_new_team instead of
- gomp_new_work_share. Call gomp_loop_init on &team->work_shares[0].
- Adjust gomp_team_start caller.
- * single.c (GOMP_single_start, GOMP_single_copy_start): Call
- gomp_work_share_init_done if gomp_work_share_start returned true.
- Don't unlock ws->lock.
- * parallel.c (GOMP_parallel_start): Call gomp_new_team and pass that
- as last argument to gomp_team_start.
- * config/linux/ptrlock.c: New file.
- * config/linux/ptrlock.h: New file.
- * config/posix/ptrlock.c: New file.
- * config/posix/ptrlock.h: New file.
- * Makefile.am (libgomp_la_SOURCES): Add ptrlock.c.
- * Makefile.in: Regenerated.
- * testsuite/Makefile.in: Regenerated.
-
-2008-03-19 Jakub Jelinek <jakub@redhat.com>
-
- * libgomp.h (gomp_active_wait_policy): Remove decl.
- (gomp_throttled_spin_count_var, gomp_available_cpus,
- gomp_managed_threads): New extern decls.
- * team.c (gomp_team_start, gomp_team_end): If number of threads
- changed, adjust atomically gomp_managed_threads.
- * env.c (gomp_active_wait_policy, gomp_block_time_var): Remove.
- (gomp_throttled_spin_count_var, gomp_available_cpus,
- gomp_managed_threads): New variables.
- (parse_millis): Removed.
- (parse_spincount): New function.
- (parse_wait_policy): Return -1/0/1 instead of setting
- gomp_active_wait_policy.
- (initialize_env): Call gomp_init_num_threads unconditionally.
- Initialize gomp_available_cpus. Call parse_spincount instead
- of parse_millis, initialize gomp_{,throttled_}spin_count_var
- depending on presence and value of OMP_WAIT_POLICY and
- GOMP_SPINCOUNT env vars.
- * config/linux/wait.h (do_wait): Use gomp_throttled_spin_count_var
- instead of gomp_spin_count_var if gomp_managed_threads >
- gomp_available_cpus.
-
- * config/linux/wait.h: Include errno.h.
- (FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG): Define.
- (gomp_futex_wake, gomp_futex_wait): New extern decls.
- * config/linux/mutex.c (gomp_futex_wake, gomp_futex_wait): New
- variables.
- * config/linux/powerpc/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (sys_futex0): Return error code.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
- * config/linux/alpha/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
- * config/linux/x86/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (sys_futex0): Return error code.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
- * config/linux/s390/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (sys_futex0): Return error code.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
- * config/linux/ia64/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (sys_futex0): Return error code.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
- * config/linux/sparc/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
- (sys_futex0): Return error code.
- (futex_wake, futex_wait): If ENOSYS was returned, clear
- FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-
-2008-03-18 Jakub Jelinek <jakub@redhat.com>
-
- * libgomp.h (struct gomp_work_share): Add mode field. Put lock and
- next into a different cache line from most of the write-once fields.
- * loop.c: Include limits.h.
- (gomp_loop_init): For GFS_DYNAMIC, multiply ws->chunk_size by incr.
- If adding ws->chunk_size nthreads + 1 times after end won't
- overflow, set ws->mode to 1.
- * iter.c (gomp_iter_dynamic_next_locked): Don't multiply
- ws->chunk_size by incr.
- (gomp_iter_dynamic_next): Likewise. If ws->mode, use more efficient
- code.
- * work.c: Include stddef.h.
- (gomp_new_work_share): Use offsetof rather than sizeof.
-
-2008-03-17 Jakub Jelinek <jakub@redhat.com>
-
- * libgomp.h (struct gomp_team): Change ordered_release field
- into gomp_sem_t ** from flexible array member. Add implicit_task
- and initial_work_shares fields.
- (gomp_new_task): Removed.
- (gomp_init_task): New prototype.
- * team.c (new_team): Allocate implicit_task for each thread
- and initial work_shares together with gomp_team allocation.
- (free_team): Only free work_shares if it is not init_work_shares.
- (gomp_team_start): Use gomp_init_task instead of gomp_new_task,
- set thr->task to the corresponding implicit_task array entry.
- * task.c (gomp_new_task): Removed.
- (gomp_init_task): New function.
- (gomp_end_task): Don't free the task.
- (GOMP_task): Allocate struct gomp_task on the stack, call
- gomp_init_task rather than gomp_new_task.
- * work.c (gomp_work_share_start): If work_shares ==
- init_work_shares, gomp_malloc + memcpy rather than gomp_realloc.
-
-2008-03-15 Jakub Jelinek <jakub@redhat.com>
- Ulrich Drepper <drepper@redhat.com>
-
- * config/linux/bar.h (gomp_barrier_state_t): Rewritten.
- (gomp_barrier_state_t): Change to unsigned int.
- (gomp_barrier_init, gomp_barrier_reinit, gomp_barrier_destroy,
- gomp_barrier_wait_start, gomp_barrier_last_thread): Rewritten.
- (gomp_barrier_wait_last): Prototype rather than inline.
- * config/linux/bar.c (gomp_barrier_wait_end): Rewritten.
- (gomp_barrier_wait_last): New function.
-
-2008-03-15 Jakub Jelinek <jakub@redhat.com>
-
- * team.c (gomp_thread_start): Use gomp_barrier_wait_last instead
- of gomp_barrier_wait.
- * env.c (gomp_block_time_var, gomp_spin_count_var): New variables.
- (parse_millis): New function.
- (initialize_env): Handle GOMP_BLOCKTIME env var.
- * libgomp.h (struct gomp_team): Move close to the end of the struct.
- (gomp_spin_count_var): New extern var decl.
- * work.c (gomp_work_share_end): Use gomp_barrier_state_t bstate
- var instead of bool last, call gomp_barrier_last_thread to check
- for last thread, pass bstate to gomp_barrier_wait_end.
- * config/linux/wait.h: New file.
- * config/linux/mutex.c: Include wait.h instead of libgomp.h and
- futex.h.
- (gomp_mutex_lock_slow): Call do_wait instead of futex_wait.
- * config/linux/bar.c: Include wait.h instead of libgomp.h and
- futex.h.
- (gomp_barrier_wait_end): Change second argument to
- gomp_barrier_state_t. Call do_wait instead of futex_wait.
- * config/linux/sem.c: Include wait.h instead of libgomp.h and
- futex.h.
- (gomp_sem_wait_slow): Call do_wait instead of futex_wait.
- * config/linux/lock.c: Include wait.h instead of libgomp.h and
- futex.h.
- (gomp_set_nest_lock_25): Call do_wait instead of futex_wait.
- * config/linux/affinity.c: Assume HAVE_SYNC_BUILTINS.
- * config/linux/bar.h (gomp_barrier_state_t): New typedef.
- (gomp_barrier_wait_end): Change second argument to
- gomp_barrier_state_t.
- (gomp_barrier_wait_start): Return gomp_barrier_state_t.
- (gomp_barrier_last_thread, gomp_barrier_wait_last): New static
- inlines.
- * config/linux/powerpc/futex.h (cpu_relax, atomic_write_barrier): New
- static inlines.
- * config/linux/alpha/futex.h (cpu_relax, atomic_write_barrier):
- Likewise.
- * config/linux/x86/futex.h (cpu_relax, atomic_write_barrier):
- Likewise.
- * config/linux/s390/futex.h (cpu_relax, atomic_write_barrier):
- Likewise.
- * config/linux/ia64/futex.h (cpu_relax, atomic_write_barrier):
- Likewise.
- * config/linux/sparc/futex.h (cpu_relax, atomic_write_barrier):
- Likewise.
- * config/posix/bar.c (gomp_barrier_wait_end): Change second argument
- to gomp_barrier_state_t.
- * config/posix/bar.h (gomp_barrier_state_t): New typedef.
- (gomp_barrier_wait_end): Change second argument to
- gomp_barrier_state_t.
- (gomp_barrier_wait_start): Return gomp_barrier_state_t.
- (gomp_barrier_last_thread, gomp_barrier_wait_last): New static
- inlines.
-
---- libgomp/parallel.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/parallel.c 2008-03-26 15:32:06.000000000 +0100
-@@ -68,7 +68,7 @@ void
- GOMP_parallel_start (void (*fn) (void *), void *data, unsigned num_threads)
- {
- num_threads = gomp_resolve_num_threads (num_threads);
-- gomp_team_start (fn, data, num_threads, NULL);
-+ gomp_team_start (fn, data, num_threads, gomp_new_team (num_threads));
- }
-
- void
---- libgomp/sections.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/sections.c 2008-03-26 15:33:06.000000000 +0100
-@@ -59,14 +59,24 @@ GOMP_sections_start (unsigned count)
- long s, e, ret;
-
- if (gomp_work_share_start (false))
-- gomp_sections_init (thr->ts.work_share, count);
-+ {
-+ gomp_sections_init (thr->ts.work_share, count);
-+ gomp_work_share_init_done ();
-+ }
-
-+#ifdef HAVE_SYNC_BUILTINS
-+ if (gomp_iter_dynamic_next (&s, &e))
-+ ret = s;
-+ else
-+ ret = 0;
-+#else
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
- if (gomp_iter_dynamic_next_locked (&s, &e))
- ret = s;
- else
- ret = 0;
--
- gomp_mutex_unlock (&thr->ts.work_share->lock);
-+#endif
-
- return ret;
- }
-@@ -83,15 +93,23 @@ GOMP_sections_start (unsigned count)
- unsigned
- GOMP_sections_next (void)
- {
-- struct gomp_thread *thr = gomp_thread ();
- long s, e, ret;
-
-+#ifdef HAVE_SYNC_BUILTINS
-+ if (gomp_iter_dynamic_next (&s, &e))
-+ ret = s;
-+ else
-+ ret = 0;
-+#else
-+ struct gomp_thread *thr = gomp_thread ();
-+
- gomp_mutex_lock (&thr->ts.work_share->lock);
- if (gomp_iter_dynamic_next_locked (&s, &e))
- ret = s;
- else
- ret = 0;
- gomp_mutex_unlock (&thr->ts.work_share->lock);
-+#endif
-
- return ret;
- }
-@@ -103,15 +121,15 @@ void
- GOMP_parallel_sections_start (void (*fn) (void *), void *data,
- unsigned num_threads, unsigned count)
- {
-- struct gomp_work_share *ws;
-+ struct gomp_team *team;
-
- num_threads = gomp_resolve_num_threads (num_threads);
- if (gomp_dyn_var && num_threads > count)
- num_threads = count;
-
-- ws = gomp_new_work_share (false, num_threads);
-- gomp_sections_init (ws, count);
-- gomp_team_start (fn, data, num_threads, ws);
-+ team = gomp_new_team (num_threads);
-+ gomp_sections_init (&team->work_shares[0], count);
-+ gomp_team_start (fn, data, num_threads, team);
- }
-
- /* The GOMP_section_end* routines are called after the thread is told
---- libgomp/env.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/env.c 2008-03-26 16:40:26.000000000 +0100
-@@ -44,6 +44,11 @@ enum gomp_schedule_type gomp_run_sched_v
- unsigned long gomp_run_sched_chunk = 1;
- unsigned short *gomp_cpu_affinity;
- size_t gomp_cpu_affinity_len;
-+#ifndef HAVE_SYNC_BUILTINS
-+gomp_mutex_t gomp_remaining_threads_lock;
-+#endif
-+unsigned long gomp_available_cpus = 1, gomp_managed_threads = 1;
-+unsigned long long gomp_spin_count_var, gomp_throttled_spin_count_var;
-
- /* Parse the OMP_SCHEDULE environment variable. */
-
-@@ -147,6 +152,79 @@ parse_unsigned_long (const char *name, u
- return false;
- }
-
-+/* Parse the GOMP_SPINCOUNT environment varible. Return true if one was
-+ present and it was successfully parsed. */
-+
-+static bool
-+parse_spincount (const char *name, unsigned long long *pvalue)
-+{
-+ char *env, *end;
-+ unsigned long long value, mult = 1;
-+
-+ env = getenv (name);
-+ if (env == NULL)
-+ return false;
-+
-+ while (isspace ((unsigned char) *env))
-+ ++env;
-+ if (*env == '\0')
-+ goto invalid;
-+
-+ if (strncasecmp (env, "infinite", 8) == 0
-+ || strncasecmp (env, "infinity", 8) == 0)
-+ {
-+ value = ~0ULL;
-+ end = env + 8;
-+ goto check_tail;
-+ }
-+
-+ errno = 0;
-+ value = strtoull (env, &end, 10);
-+ if (errno)
-+ goto invalid;
-+
-+ while (isspace ((unsigned char) *end))
-+ ++end;
-+ if (*end != '\0')
-+ {
-+ switch (tolower (*end))
-+ {
-+ case 'k':
-+ mult = 1000LL;
-+ break;
-+ case 'm':
-+ mult = 1000LL * 1000LL;
-+ break;
-+ case 'g':
-+ mult = 1000LL * 1000LL * 1000LL;
-+ break;
-+ case 't':
-+ mult = 1000LL * 1000LL * 1000LL * 1000LL;
-+ break;
-+ default:
-+ goto invalid;
-+ }
-+ ++end;
-+ check_tail:
-+ while (isspace ((unsigned char) *end))
-+ ++end;
-+ if (*end != '\0')
-+ goto invalid;
-+ }
-+
-+ if (value > ~0ULL / mult)
-+ value = ~0ULL;
-+ else
-+ value *= mult;
-+
-+ *pvalue = value;
-+ return true;
-+
-+ invalid:
-+ gomp_error ("Invalid value for environment variable %s", name);
-+ return false;
-+}
-+
- /* Parse a boolean value for environment variable NAME and store the
- result in VALUE. */
-
-@@ -281,10 +359,25 @@ initialize_env (void)
- parse_schedule ();
- parse_boolean ("OMP_DYNAMIC", &gomp_dyn_var);
- parse_boolean ("OMP_NESTED", &gomp_nest_var);
-+ gomp_init_num_threads ();
-+ gomp_available_cpus = gomp_nthreads_var;
- if (!parse_unsigned_long ("OMP_NUM_THREADS", &gomp_nthreads_var))
-- gomp_init_num_threads ();
-+ gomp_nthreads_var = gomp_available_cpus;
- if (parse_affinity ())
- gomp_init_affinity ();
-+ if (!parse_spincount ("GOMP_SPINCOUNT", &gomp_spin_count_var))
-+ {
-+ /* Using a rough estimation of 100000 spins per msec,
-+ use 200 msec blocking.
-+ Depending on the CPU speed, this can be e.g. 5 times longer
-+ or 5 times shorter. */
-+ gomp_spin_count_var = 20000000LL;
-+ }
-+ /* gomp_throttled_spin_count_var is used when there are more libgomp
-+ managed threads than available CPUs. Use very short spinning. */
-+ gomp_throttled_spin_count_var = 100LL;
-+ if (gomp_throttled_spin_count_var > gomp_spin_count_var)
-+ gomp_throttled_spin_count_var = gomp_spin_count_var;
-
- /* Not strictly environment related, but ordering constructors is tricky. */
- pthread_attr_init (&gomp_thread_attr);
---- libgomp/libgomp.h.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/libgomp.h 2008-03-27 12:21:51.000000000 +0100
-@@ -50,6 +50,7 @@
- #include "sem.h"
- #include "mutex.h"
- #include "bar.h"
-+#include "ptrlock.h"
-
-
- /* This structure contains the data to control one work-sharing construct,
-@@ -70,6 +71,8 @@ struct gomp_work_share
- If this is a SECTIONS construct, this value will always be DYNAMIC. */
- enum gomp_schedule_type sched;
-
-+ int mode;
-+
- /* This is the chunk_size argument to the SCHEDULE clause. */
- long chunk_size;
-
-@@ -81,17 +84,38 @@ struct gomp_work_share
- is always 1. */
- long incr;
-
-- /* This lock protects the update of the following members. */
-- gomp_mutex_t lock;
-+ /* This is a circular queue that details which threads will be allowed
-+ into the ordered region and in which order. When a thread allocates
-+ iterations on which it is going to work, it also registers itself at
-+ the end of the array. When a thread reaches the ordered region, it
-+ checks to see if it is the one at the head of the queue. If not, it
-+ blocks on its RELEASE semaphore. */
-+ unsigned *ordered_team_ids;
-
-- union {
-- /* This is the next iteration value to be allocated. In the case of
-- GFS_STATIC loops, this the iteration start point and never changes. */
-- long next;
-+ /* This is the number of threads that have registered themselves in
-+ the circular queue ordered_team_ids. */
-+ unsigned ordered_num_used;
-
-- /* This is the returned data structure for SINGLE COPYPRIVATE. */
-- void *copyprivate;
-- };
-+ /* This is the team_id of the currently acknowledged owner of the ordered
-+ section, or -1u if the ordered section has not been acknowledged by
-+ any thread. This is distinguished from the thread that is *allowed*
-+ to take the section next. */
-+ unsigned ordered_owner;
-+
-+ /* This is the index into the circular queue ordered_team_ids of the
-+ current thread that's allowed into the ordered reason. */
-+ unsigned ordered_cur;
-+
-+ /* This is a chain of allocated gomp_work_share blocks, valid only
-+ in the first gomp_work_share struct in the block. */
-+ struct gomp_work_share *next_alloc;
-+
-+ /* The above fields are written once during workshare initialization,
-+ or related to ordered worksharing. Make sure the following fields
-+ are in a different cache line. */
-+
-+ /* This lock protects the update of the following members. */
-+ gomp_mutex_t lock __attribute__((aligned (64)));
-
- /* This is the count of the number of threads that have exited the work
- share construct. If the construct was marked nowait, they have moved on
-@@ -99,27 +123,28 @@ struct gomp_work_share
- of the team to exit the work share construct must deallocate it. */
- unsigned threads_completed;
-
-- /* This is the index into the circular queue ordered_team_ids of the
-- current thread that's allowed into the ordered reason. */
-- unsigned ordered_cur;
-+ union {
-+ /* This is the next iteration value to be allocated. In the case of
-+ GFS_STATIC loops, this the iteration start point and never changes. */
-+ long next;
-
-- /* This is the number of threads that have registered themselves in
-- the circular queue ordered_team_ids. */
-- unsigned ordered_num_used;
-+ /* This is the returned data structure for SINGLE COPYPRIVATE. */
-+ void *copyprivate;
-+ };
-
-- /* This is the team_id of the currently acknoledged owner of the ordered
-- section, or -1u if the ordered section has not been acknowledged by
-- any thread. This is distinguished from the thread that is *allowed*
-- to take the section next. */
-- unsigned ordered_owner;
-+ union {
-+ /* Link to gomp_work_share struct for next work sharing construct
-+ encountered after this one. */
-+ gomp_ptrlock_t next_ws;
-+
-+ /* gomp_work_share structs are chained in the free work share cache
-+ through this. */
-+ struct gomp_work_share *next_free;
-+ };
-
-- /* This is a circular queue that details which threads will be allowed
-- into the ordered region and in which order. When a thread allocates
-- iterations on which it is going to work, it also registers itself at
-- the end of the array. When a thread reaches the ordered region, it
-- checks to see if it is the one at the head of the queue. If not, it
-- blocks on its RELEASE semaphore. */
-- unsigned ordered_team_ids[];
-+ /* If only few threads are in the team, ordered_team_ids can point
-+ to this array which fills the padding at the end of this struct. */
-+ unsigned inline_ordered_team_ids[0];
- };
-
- /* This structure contains all of the thread-local data associated with
-@@ -133,21 +158,24 @@ struct gomp_team_state
-
- /* This is the work share construct which this thread is currently
- processing. Recall that with NOWAIT, not all threads may be
-- processing the same construct. This value is NULL when there
-- is no construct being processed. */
-+ processing the same construct. */
- struct gomp_work_share *work_share;
-
-+ /* This is the previous work share construct or NULL if there wasn't any.
-+ When all threads are done with the current work sharing construct,
-+ the previous one can be freed. The current one can't, as its
-+ next_ws field is used. */
-+ struct gomp_work_share *last_work_share;
-+
- /* This is the ID of this thread within the team. This value is
- guaranteed to be between 0 and N-1, where N is the number of
- threads in the team. */
- unsigned team_id;
-
-- /* The work share "generation" is a number that increases by one for
-- each work share construct encountered in the dynamic flow of the
-- program. It is used to find the control data for the work share
-- when encountering it for the first time. This particular number
-- reflects the generation of the work_share member of this struct. */
-- unsigned work_share_generation;
-+#ifdef HAVE_SYNC_BUILTINS
-+ /* Number of single stmts encountered. */
-+ unsigned long single_count;
-+#endif
-
- /* For GFS_RUNTIME loops that resolved to GFS_STATIC, this is the
- trip number through the loop. So first time a particular loop
-@@ -163,41 +191,53 @@ struct gomp_team_state
-
- struct gomp_team
- {
-- /* This lock protects access to the following work shares data structures. */
-- gomp_mutex_t work_share_lock;
--
-- /* This is a dynamically sized array containing pointers to the control
-- structs for all "live" work share constructs. Here "live" means that
-- the construct has been encountered by at least one thread, and not
-- completed by all threads. */
-- struct gomp_work_share **work_shares;
--
-- /* The work_shares array is indexed by "generation & generation_mask".
-- The mask will be 2**N - 1, where 2**N is the size of the array. */
-- unsigned generation_mask;
--
-- /* These two values define the bounds of the elements of the work_shares
-- array that are currently in use. */
-- unsigned oldest_live_gen;
-- unsigned num_live_gen;
--
- /* This is the number of threads in the current team. */
- unsigned nthreads;
-
-+ /* This is number of gomp_work_share structs that have been allocated
-+ as a block last time. */
-+ unsigned work_share_chunk;
-+
- /* This is the saved team state that applied to a master thread before
- the current thread was created. */
- struct gomp_team_state prev_ts;
-
-- /* This barrier is used for most synchronization of the team. */
-- gomp_barrier_t barrier;
--
- /* This semaphore should be used by the master thread instead of its
- "native" semaphore in the thread structure. Required for nested
- parallels, as the master is a member of two teams. */
- gomp_sem_t master_release;
-
-- /* This array contains pointers to the release semaphore of the threads
-- in the team. */
-+ /* List of gomp_work_share structs chained through next_free fields.
-+ This is populated and taken off only by the first thread in the
-+ team encountering a new work sharing construct, in a critical
-+ section. */
-+ struct gomp_work_share *work_share_list_alloc;
-+
-+ /* List of gomp_work_share structs freed by free_work_share. New
-+ entries are atomically added to the start of the list, and
-+ alloc_work_share can safely only move all but the first entry
-+ to work_share_list alloc, as free_work_share can happen concurrently
-+ with alloc_work_share. */
-+ struct gomp_work_share *work_share_list_free;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+ /* Number of simple single regions encountered by threads in this
-+ team. */
-+ unsigned long single_count;
-+#else
-+ /* Mutex protecting addition of workshares to work_share_list_free. */
-+ gomp_mutex_t work_share_list_free_lock;
-+#endif
-+
-+ /* This barrier is used for most synchronization of the team. */
-+ gomp_barrier_t barrier;
-+
-+ /* Initial work shares, to avoid allocating any gomp_work_share
-+ structs in the common case. */
-+ struct gomp_work_share work_shares[8];
-+
-+ /* This is an array with pointers to the release semaphore
-+ of the threads in the team. */
- gomp_sem_t *ordered_release[];
- };
-
-@@ -242,6 +282,11 @@ extern bool gomp_dyn_var;
- extern bool gomp_nest_var;
- extern enum gomp_schedule_type gomp_run_sched_var;
- extern unsigned long gomp_run_sched_chunk;
-+#ifndef HAVE_SYNC_BUILTINS
-+extern gomp_mutex_t gomp_remaining_threads_lock;
-+#endif
-+extern unsigned long long gomp_spin_count_var, gomp_throttled_spin_count_var;
-+extern unsigned long gomp_available_cpus, gomp_managed_threads;
-
- /* The attributes to be used during thread creation. */
- extern pthread_attr_t gomp_thread_attr;
-@@ -306,17 +351,27 @@ extern unsigned gomp_dynamic_max_threads
-
- /* team.c */
-
-+extern struct gomp_team *gomp_new_team (unsigned);
- extern void gomp_team_start (void (*) (void *), void *, unsigned,
-- struct gomp_work_share *);
-+ struct gomp_team *);
- extern void gomp_team_end (void);
-
- /* work.c */
-
--extern struct gomp_work_share * gomp_new_work_share (bool, unsigned);
-+extern void gomp_init_work_share (struct gomp_work_share *, bool, unsigned);
-+extern void gomp_fini_work_share (struct gomp_work_share *);
- extern bool gomp_work_share_start (bool);
- extern void gomp_work_share_end (void);
- extern void gomp_work_share_end_nowait (void);
-
-+static inline void
-+gomp_work_share_init_done (void)
-+{
-+ struct gomp_thread *thr = gomp_thread ();
-+ if (__builtin_expect (thr->ts.last_work_share != NULL, 1))
-+ gomp_ptrlock_set (&thr->ts.last_work_share->next_ws, thr->ts.work_share);
-+}
-+
- #ifdef HAVE_ATTRIBUTE_VISIBILITY
- # pragma GCC visibility pop
- #endif
---- libgomp/iter.c.jj 2008-03-26 14:48:34.000000000 +0100
-+++ libgomp/iter.c 2008-03-26 15:11:23.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -154,7 +154,7 @@ gomp_iter_dynamic_next_locked (long *pst
- if (start == ws->end)
- return false;
-
-- chunk = ws->chunk_size * ws->incr;
-+ chunk = ws->chunk_size;
- left = ws->end - start;
- if (ws->incr < 0)
- {
-@@ -186,11 +186,38 @@ gomp_iter_dynamic_next (long *pstart, lo
- struct gomp_work_share *ws = thr->ts.work_share;
- long start, end, nend, chunk, incr;
-
-- start = ws->next;
- end = ws->end;
- incr = ws->incr;
-- chunk = ws->chunk_size * incr;
-+ chunk = ws->chunk_size;
-+
-+ if (__builtin_expect (ws->mode, 1))
-+ {
-+ long tmp = __sync_fetch_and_add (&ws->next, chunk);
-+ if (incr > 0)
-+ {
-+ if (tmp >= end)
-+ return false;
-+ nend = tmp + chunk;
-+ if (nend > end)
-+ nend = end;
-+ *pstart = tmp;
-+ *pend = nend;
-+ return true;
-+ }
-+ else
-+ {
-+ if (tmp <= end)
-+ return false;
-+ nend = tmp + chunk;
-+ if (nend < end)
-+ nend = end;
-+ *pstart = tmp;
-+ *pend = nend;
-+ return true;
-+ }
-+ }
-
-+ start = ws->next;
- while (1)
- {
- long left = end - start;
---- libgomp/work.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/work.c 2008-03-27 12:21:51.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,39 +29,138 @@
- of threads. */
-
- #include "libgomp.h"
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
-
-
--/* Create a new work share structure. */
-+/* Allocate a new work share structure, preferably from current team's
-+ free gomp_work_share cache. */
-
--struct gomp_work_share *
--gomp_new_work_share (bool ordered, unsigned nthreads)
-+static struct gomp_work_share *
-+alloc_work_share (struct gomp_team *team)
- {
- struct gomp_work_share *ws;
-- size_t size;
-+ unsigned int i;
-
-- size = sizeof (*ws);
-- if (ordered)
-- size += nthreads * sizeof (ws->ordered_team_ids[0]);
-+ /* This is called in a critical section. */
-+ if (team->work_share_list_alloc != NULL)
-+ {
-+ ws = team->work_share_list_alloc;
-+ team->work_share_list_alloc = ws->next_free;
-+ return ws;
-+ }
-
-- ws = gomp_malloc_cleared (size);
-- gomp_mutex_init (&ws->lock);
-- ws->ordered_owner = -1;
-+#ifdef HAVE_SYNC_BUILTINS
-+ ws = team->work_share_list_free;
-+ /* We need atomic read from work_share_list_free,
-+ as free_work_share can be called concurrently. */
-+ __asm ("" : "+r" (ws));
-+
-+ if (ws && ws->next_free)
-+ {
-+ struct gomp_work_share *next = ws->next_free;
-+ ws->next_free = NULL;
-+ team->work_share_list_alloc = next->next_free;
-+ return next;
-+ }
-+#else
-+ gomp_mutex_lock (&team->work_share_list_free_lock);
-+ ws = team->work_share_list_free;
-+ if (ws)
-+ {
-+ team->work_share_list_alloc = ws->next_free;
-+ team->work_share_list_free = NULL;
-+ gomp_mutex_unlock (&team->work_share_list_free_lock);
-+ return ws;
-+ }
-+ gomp_mutex_unlock (&team->work_share_list_free_lock);
-+#endif
-
-+ team->work_share_chunk *= 2;
-+ ws = gomp_malloc (team->work_share_chunk * sizeof (struct gomp_work_share));
-+ ws->next_alloc = team->work_shares[0].next_alloc;
-+ team->work_shares[0].next_alloc = ws;
-+ team->work_share_list_alloc = &ws[1];
-+ for (i = 1; i < team->work_share_chunk - 1; i++)
-+ ws[i].next_free = &ws[i + 1];
-+ ws[i].next_free = NULL;
- return ws;
- }
-
-+/* Initialize an already allocated struct gomp_work_share.
-+ This shouldn't touch the next_alloc field. */
-+
-+void
-+gomp_init_work_share (struct gomp_work_share *ws, bool ordered,
-+ unsigned nthreads)
-+{
-+ gomp_mutex_init (&ws->lock);
-+ if (__builtin_expect (ordered, 0))
-+ {
-+#define INLINE_ORDERED_TEAM_IDS_CNT \
-+ ((sizeof (struct gomp_work_share) \
-+ - offsetof (struct gomp_work_share, inline_ordered_team_ids)) \
-+ / sizeof (((struct gomp_work_share *) 0)->inline_ordered_team_ids[0]))
-+
-+ if (nthreads > INLINE_ORDERED_TEAM_IDS_CNT)
-+ ws->ordered_team_ids
-+ = gomp_malloc (nthreads * sizeof (*ws->ordered_team_ids));
-+ else
-+ ws->ordered_team_ids = ws->inline_ordered_team_ids;
-+ memset (ws->ordered_team_ids, '\0',
-+ nthreads * sizeof (*ws->ordered_team_ids));
-+ ws->ordered_num_used = 0;
-+ ws->ordered_owner = -1;
-+ ws->ordered_cur = 0;
-+ }
-+ else
-+ ws->ordered_team_ids = NULL;
-+ gomp_ptrlock_init (&ws->next_ws, NULL);
-+ ws->threads_completed = 0;
-+}
-
--/* Free a work share structure. */
-+/* Do any needed destruction of gomp_work_share fields before it
-+ is put back into free gomp_work_share cache or freed. */
-
--static void
--free_work_share (struct gomp_work_share *ws)
-+void
-+gomp_fini_work_share (struct gomp_work_share *ws)
- {
- gomp_mutex_destroy (&ws->lock);
-- free (ws);
-+ if (ws->ordered_team_ids != ws->inline_ordered_team_ids)
-+ free (ws->ordered_team_ids);
-+ gomp_ptrlock_destroy (&ws->next_ws);
- }
-
-+/* Free a work share struct, if not orphaned, put it into current
-+ team's free gomp_work_share cache. */
-+
-+static inline void
-+free_work_share (struct gomp_team *team, struct gomp_work_share *ws)
-+{
-+ gomp_fini_work_share (ws);
-+ if (__builtin_expect (team == NULL, 0))
-+ free (ws);
-+ else
-+ {
-+ struct gomp_work_share *next_ws;
-+#ifdef HAVE_SYNC_BUILTINS
-+ do
-+ {
-+ next_ws = team->work_share_list_free;
-+ ws->next_free = next_ws;
-+ }
-+ while (!__sync_bool_compare_and_swap (&team->work_share_list_free,
-+ next_ws, ws));
-+#else
-+ gomp_mutex_lock (&team->work_share_list_free_lock);
-+ next_ws = team->work_share_list_free;
-+ ws->next_free = next_ws;
-+ team->work_share_list_free = ws;
-+ gomp_mutex_unlock (&team->work_share_list_free_lock);
-+#endif
-+ }
-+}
-
- /* The current thread is ready to begin the next work sharing construct.
- In all cases, thr->ts.work_share is updated to point to the new
-@@ -74,71 +173,34 @@ gomp_work_share_start (bool ordered)
- struct gomp_thread *thr = gomp_thread ();
- struct gomp_team *team = thr->ts.team;
- struct gomp_work_share *ws;
-- unsigned ws_index, ws_gen;
-
- /* Work sharing constructs can be orphaned. */
- if (team == NULL)
- {
-- ws = gomp_new_work_share (ordered, 1);
-+ ws = gomp_malloc (sizeof (*ws));
-+ gomp_init_work_share (ws, ordered, 1);
- thr->ts.work_share = ws;
-- thr->ts.static_trip = 0;
-- gomp_mutex_lock (&ws->lock);
-- return true;
-+ return ws;
- }
-
-- gomp_mutex_lock (&team->work_share_lock);
--
-- /* This thread is beginning its next generation. */
-- ws_gen = ++thr->ts.work_share_generation;
--
-- /* If this next generation is not newer than any other generation in
-- the team, then simply reference the existing construct. */
-- if (ws_gen - team->oldest_live_gen < team->num_live_gen)
-+ ws = thr->ts.work_share;
-+ thr->ts.last_work_share = ws;
-+ ws = gomp_ptrlock_get (&ws->next_ws);
-+ if (ws == NULL)
- {
-- ws_index = ws_gen & team->generation_mask;
-- ws = team->work_shares[ws_index];
-+ /* This thread encountered a new ws first. */
-+ struct gomp_work_share *ws = alloc_work_share (team);
-+ gomp_init_work_share (ws, ordered, team->nthreads);
- thr->ts.work_share = ws;
-- thr->ts.static_trip = 0;
--
-- gomp_mutex_lock (&ws->lock);
-- gomp_mutex_unlock (&team->work_share_lock);
--
-- return false;
-+ return true;
- }
--
-- /* Resize the work shares queue if we've run out of space. */
-- if (team->num_live_gen++ == team->generation_mask)
-+ else
- {
-- team->work_shares = gomp_realloc (team->work_shares,
-- 2 * team->num_live_gen
-- * sizeof (*team->work_shares));
--
-- /* Unless oldest_live_gen is zero, the sequence of live elements
-- wraps around the end of the array. If we do nothing, we break
-- lookup of the existing elements. Fix that by unwrapping the
-- data from the front to the end. */
-- if (team->oldest_live_gen > 0)
-- memcpy (team->work_shares + team->num_live_gen,
-- team->work_shares,
-- (team->oldest_live_gen & team->generation_mask)
-- * sizeof (*team->work_shares));
--
-- team->generation_mask = team->generation_mask * 2 + 1;
-- }
--
-- ws_index = ws_gen & team->generation_mask;
-- ws = gomp_new_work_share (ordered, team->nthreads);
-- thr->ts.work_share = ws;
-- thr->ts.static_trip = 0;
-- team->work_shares[ws_index] = ws;
--
-- gomp_mutex_lock (&ws->lock);
-- gomp_mutex_unlock (&team->work_share_lock);
--
-- return true;
-+ thr->ts.work_share = ws;
-+ return false;
-+ }
- }
-
--
- /* The current thread is done with its current work sharing construct.
- This version does imply a barrier at the end of the work-share. */
-
-@@ -147,36 +209,28 @@ gomp_work_share_end (void)
- {
- struct gomp_thread *thr = gomp_thread ();
- struct gomp_team *team = thr->ts.team;
-- struct gomp_work_share *ws = thr->ts.work_share;
-- bool last;
--
-- thr->ts.work_share = NULL;
-+ gomp_barrier_state_t bstate;
-
- /* Work sharing constructs can be orphaned. */
- if (team == NULL)
- {
-- free_work_share (ws);
-+ free_work_share (NULL, thr->ts.work_share);
-+ thr->ts.work_share = NULL;
- return;
- }
-
-- last = gomp_barrier_wait_start (&team->barrier);
-+ bstate = gomp_barrier_wait_start (&team->barrier);
-
-- if (last)
-+ if (gomp_barrier_last_thread (bstate))
- {
-- unsigned ws_index;
--
-- ws_index = thr->ts.work_share_generation & team->generation_mask;
-- team->work_shares[ws_index] = NULL;
-- team->oldest_live_gen++;
-- team->num_live_gen = 0;
--
-- free_work_share (ws);
-+ if (__builtin_expect (thr->ts.last_work_share != NULL, 1))
-+ free_work_share (team, thr->ts.last_work_share);
- }
-
-- gomp_barrier_wait_end (&team->barrier, last);
-+ gomp_barrier_wait_end (&team->barrier, bstate);
-+ thr->ts.last_work_share = NULL;
- }
-
--
- /* The current thread is done with its current work sharing construct.
- This version does NOT imply a barrier at the end of the work-share. */
-
-@@ -188,15 +242,17 @@ gomp_work_share_end_nowait (void)
- struct gomp_work_share *ws = thr->ts.work_share;
- unsigned completed;
-
-- thr->ts.work_share = NULL;
--
- /* Work sharing constructs can be orphaned. */
- if (team == NULL)
- {
-- free_work_share (ws);
-+ free_work_share (NULL, ws);
-+ thr->ts.work_share = NULL;
- return;
- }
-
-+ if (__builtin_expect (thr->ts.last_work_share == NULL, 0))
-+ return;
-+
- #ifdef HAVE_SYNC_BUILTINS
- completed = __sync_add_and_fetch (&ws->threads_completed, 1);
- #else
-@@ -206,18 +262,6 @@ gomp_work_share_end_nowait (void)
- #endif
-
- if (completed == team->nthreads)
-- {
-- unsigned ws_index;
--
-- gomp_mutex_lock (&team->work_share_lock);
--
-- ws_index = thr->ts.work_share_generation & team->generation_mask;
-- team->work_shares[ws_index] = NULL;
-- team->oldest_live_gen++;
-- team->num_live_gen--;
--
-- gomp_mutex_unlock (&team->work_share_lock);
--
-- free_work_share (ws);
-- }
-+ free_work_share (team, thr->ts.last_work_share);
-+ thr->ts.last_work_share = NULL;
- }
---- libgomp/single.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/single.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -37,10 +37,24 @@
- bool
- GOMP_single_start (void)
- {
-+#ifdef HAVE_SYNC_BUILTINS
-+ struct gomp_thread *thr = gomp_thread ();
-+ struct gomp_team *team = thr->ts.team;
-+ unsigned long single_count;
-+
-+ if (__builtin_expect (team == NULL, 0))
-+ return true;
-+
-+ single_count = thr->ts.single_count++;
-+ return __sync_bool_compare_and_swap (&team->single_count, single_count,
-+ single_count + 1L);
-+#else
- bool ret = gomp_work_share_start (false);
-- gomp_mutex_unlock (&gomp_thread ()->ts.work_share->lock);
-+ if (ret)
-+ gomp_work_share_init_done ();
- gomp_work_share_end_nowait ();
- return ret;
-+#endif
- }
-
- /* This routine is called when first encountering a SINGLE construct that
-@@ -57,10 +71,12 @@ GOMP_single_copy_start (void)
- void *ret;
-
- first = gomp_work_share_start (false);
-- gomp_mutex_unlock (&thr->ts.work_share->lock);
-
- if (first)
-- ret = NULL;
-+ {
-+ gomp_work_share_init_done ();
-+ ret = NULL;
-+ }
- else
- {
- gomp_barrier_wait (&thr->ts.team->barrier);
---- libgomp/loop.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/loop.c 2008-03-26 18:47:04.000000000 +0100
-@@ -27,8 +27,9 @@
-
- /* This file handles the LOOP (FOR/DO) construct. */
-
--#include "libgomp.h"
-+#include <limits.h>
- #include <stdlib.h>
-+#include "libgomp.h"
-
-
- /* Initialize the given work share construct from the given arguments. */
-@@ -44,6 +45,39 @@ gomp_loop_init (struct gomp_work_share *
- ? start : end;
- ws->incr = incr;
- ws->next = start;
-+ if (sched == GFS_DYNAMIC)
-+ {
-+ ws->chunk_size *= incr;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+ {
-+ /* For dynamic scheduling prepare things to make each iteration
-+ faster. */
-+ struct gomp_thread *thr = gomp_thread ();
-+ struct gomp_team *team = thr->ts.team;
-+ long nthreads = team ? team->nthreads : 1;
-+
-+ if (__builtin_expect (incr > 0, 1))
-+ {
-+ /* Cheap overflow protection. */
-+ if (__builtin_expect ((nthreads | ws->chunk_size)
-+ >= 1UL << (sizeof (long)
-+ * __CHAR_BIT__ / 2 - 1), 0))
-+ ws->mode = 0;
-+ else
-+ ws->mode = ws->end < (LONG_MAX
-+ - (nthreads + 1) * ws->chunk_size);
-+ }
-+ /* Cheap overflow protection. */
-+ else if (__builtin_expect ((nthreads | -ws->chunk_size)
-+ >= 1UL << (sizeof (long)
-+ * __CHAR_BIT__ / 2 - 1), 0))
-+ ws->mode = 0;
-+ else
-+ ws->mode = ws->end > (nthreads + 1) * -ws->chunk_size - LONG_MAX;
-+ }
-+#endif
-+ }
- }
-
- /* The *_start routines are called when first encountering a loop construct
-@@ -68,10 +102,13 @@ gomp_loop_static_start (long start, long
- {
- struct gomp_thread *thr = gomp_thread ();
-
-+ thr->ts.static_trip = 0;
- if (gomp_work_share_start (false))
-- gomp_loop_init (thr->ts.work_share, start, end, incr,
-- GFS_STATIC, chunk_size);
-- gomp_mutex_unlock (&thr->ts.work_share->lock);
-+ {
-+ gomp_loop_init (thr->ts.work_share, start, end, incr,
-+ GFS_STATIC, chunk_size);
-+ gomp_work_share_init_done ();
-+ }
-
- return !gomp_iter_static_next (istart, iend);
- }
-@@ -84,13 +121,16 @@ gomp_loop_dynamic_start (long start, lon
- bool ret;
-
- if (gomp_work_share_start (false))
-- gomp_loop_init (thr->ts.work_share, start, end, incr,
-- GFS_DYNAMIC, chunk_size);
-+ {
-+ gomp_loop_init (thr->ts.work_share, start, end, incr,
-+ GFS_DYNAMIC, chunk_size);
-+ gomp_work_share_init_done ();
-+ }
-
- #ifdef HAVE_SYNC_BUILTINS
-- gomp_mutex_unlock (&thr->ts.work_share->lock);
- ret = gomp_iter_dynamic_next (istart, iend);
- #else
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
- ret = gomp_iter_dynamic_next_locked (istart, iend);
- gomp_mutex_unlock (&thr->ts.work_share->lock);
- #endif
-@@ -106,13 +146,16 @@ gomp_loop_guided_start (long start, long
- bool ret;
-
- if (gomp_work_share_start (false))
-- gomp_loop_init (thr->ts.work_share, start, end, incr,
-- GFS_GUIDED, chunk_size);
-+ {
-+ gomp_loop_init (thr->ts.work_share, start, end, incr,
-+ GFS_GUIDED, chunk_size);
-+ gomp_work_share_init_done ();
-+ }
-
- #ifdef HAVE_SYNC_BUILTINS
-- gomp_mutex_unlock (&thr->ts.work_share->lock);
- ret = gomp_iter_guided_next (istart, iend);
- #else
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
- ret = gomp_iter_guided_next_locked (istart, iend);
- gomp_mutex_unlock (&thr->ts.work_share->lock);
- #endif
-@@ -149,13 +192,14 @@ gomp_loop_ordered_static_start (long sta
- {
- struct gomp_thread *thr = gomp_thread ();
-
-+ thr->ts.static_trip = 0;
- if (gomp_work_share_start (true))
- {
- gomp_loop_init (thr->ts.work_share, start, end, incr,
- GFS_STATIC, chunk_size);
- gomp_ordered_static_init ();
-+ gomp_work_share_init_done ();
- }
-- gomp_mutex_unlock (&thr->ts.work_share->lock);
-
- return !gomp_iter_static_next (istart, iend);
- }
-@@ -168,8 +212,14 @@ gomp_loop_ordered_dynamic_start (long st
- bool ret;
-
- if (gomp_work_share_start (true))
-- gomp_loop_init (thr->ts.work_share, start, end, incr,
-- GFS_DYNAMIC, chunk_size);
-+ {
-+ gomp_loop_init (thr->ts.work_share, start, end, incr,
-+ GFS_DYNAMIC, chunk_size);
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
-+ gomp_work_share_init_done ();
-+ }
-+ else
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
-
- ret = gomp_iter_dynamic_next_locked (istart, iend);
- if (ret)
-@@ -187,8 +237,14 @@ gomp_loop_ordered_guided_start (long sta
- bool ret;
-
- if (gomp_work_share_start (true))
-- gomp_loop_init (thr->ts.work_share, start, end, incr,
-- GFS_GUIDED, chunk_size);
-+ {
-+ gomp_loop_init (thr->ts.work_share, start, end, incr,
-+ GFS_GUIDED, chunk_size);
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
-+ gomp_work_share_init_done ();
-+ }
-+ else
-+ gomp_mutex_lock (&thr->ts.work_share->lock);
-
- ret = gomp_iter_guided_next_locked (istart, iend);
- if (ret)
-@@ -375,12 +431,12 @@ gomp_parallel_loop_start (void (*fn) (vo
- long incr, enum gomp_schedule_type sched,
- long chunk_size)
- {
-- struct gomp_work_share *ws;
-+ struct gomp_team *team;
-
- num_threads = gomp_resolve_num_threads (num_threads);
-- ws = gomp_new_work_share (false, num_threads);
-- gomp_loop_init (ws, start, end, incr, sched, chunk_size);
-- gomp_team_start (fn, data, num_threads, ws);
-+ team = gomp_new_team (num_threads);
-+ gomp_loop_init (&team->work_shares[0], start, end, incr, sched, chunk_size);
-+ gomp_team_start (fn, data, num_threads, team);
- }
-
- void
---- libgomp/Makefile.in.jj 2008-01-10 20:53:47.000000000 +0100
-+++ libgomp/Makefile.in 2008-03-26 18:51:01.000000000 +0100
-@@ -83,7 +83,7 @@ libgomp_la_LIBADD =
- am_libgomp_la_OBJECTS = alloc.lo barrier.lo critical.lo env.lo \
- error.lo iter.lo loop.lo ordered.lo parallel.lo sections.lo \
- single.lo team.lo work.lo lock.lo mutex.lo proc.lo sem.lo \
-- bar.lo time.lo fortran.lo affinity.lo
-+ bar.lo ptrlock.lo time.lo fortran.lo affinity.lo
- libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/../depcomp
-@@ -292,7 +292,7 @@ libgomp_version_info = -version-info $(l
- libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script)
- libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
- loop.c ordered.c parallel.c sections.c single.c team.c work.c \
-- lock.c mutex.c proc.c sem.c bar.c time.c fortran.c affinity.c
-+ lock.c mutex.c proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c
-
- nodist_noinst_HEADERS = libgomp_f.h
- nodist_libsubinclude_HEADERS = omp.h
-@@ -434,6 +434,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ordered.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptrlock.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sections.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/single.Plo@am__quote@
---- libgomp/testsuite/libgomp.c/loop-4.c.jj 2008-03-26 18:47:04.000000000 +0100
-+++ libgomp/testsuite/libgomp.c/loop-4.c 2008-03-26 18:47:04.000000000 +0100
-@@ -0,0 +1,28 @@
-+/* { dg-do run } */
-+
-+extern void abort (void);
-+
-+int
-+main (void)
-+{
-+ int e = 0;
-+#pragma omp parallel num_threads (4) reduction(+:e)
-+ {
-+ long i;
-+ #pragma omp for schedule(dynamic,1)
-+ for (i = __LONG_MAX__ - 30001; i <= __LONG_MAX__ - 10001; i += 10000)
-+ if (i != __LONG_MAX__ - 30001
-+ && i != __LONG_MAX__ - 20001
-+ && i != __LONG_MAX__ - 10001)
-+ e = 1;
-+ #pragma omp for schedule(dynamic,1)
-+ for (i = -__LONG_MAX__ + 30000; i >= -__LONG_MAX__ + 10000; i -= 10000)
-+ if (i != -__LONG_MAX__ + 30000
-+ && i != -__LONG_MAX__ + 20000
-+ && i != -__LONG_MAX__ + 10000)
-+ e = 1;
-+ }
-+ if (e)
-+ abort ();
-+ return 0;
-+}
---- libgomp/Makefile.am.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/Makefile.am 2008-03-26 15:15:19.000000000 +0100
-@@ -31,7 +31,7 @@ libgomp_la_LDFLAGS = $(libgomp_version_i
-
- libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
- loop.c ordered.c parallel.c sections.c single.c team.c work.c \
-- lock.c mutex.c proc.c sem.c bar.c time.c fortran.c affinity.c
-+ lock.c mutex.c proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c
-
- nodist_noinst_HEADERS = libgomp_f.h
- nodist_libsubinclude_HEADERS = omp.h
---- libgomp/team.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/team.c 2008-03-27 12:22:26.000000000 +0100
-@@ -94,7 +94,7 @@ gomp_thread_start (void *xdata)
- {
- gomp_barrier_wait (&thr->ts.team->barrier);
- local_fn (local_data);
-- gomp_barrier_wait (&thr->ts.team->barrier);
-+ gomp_barrier_wait_last (&thr->ts.team->barrier);
- }
- else
- {
-@@ -114,11 +114,10 @@ gomp_thread_start (void *xdata)
- thr->data = NULL;
- thr->ts.team = NULL;
- thr->ts.work_share = NULL;
-+ thr->ts.last_work_share = NULL;
- thr->ts.team_id = 0;
-- thr->ts.work_share_generation = 0;
-- thr->ts.static_trip = 0;
-
-- gomp_barrier_wait (&team->barrier);
-+ gomp_barrier_wait_last (&team->barrier);
- gomp_barrier_wait (&gomp_threads_dock);
-
- local_fn = thr->fn;
-@@ -133,21 +132,29 @@ gomp_thread_start (void *xdata)
-
- /* Create a new team data structure. */
-
--static struct gomp_team *
--new_team (unsigned nthreads, struct gomp_work_share *work_share)
-+struct gomp_team *
-+gomp_new_team (unsigned nthreads)
- {
- struct gomp_team *team;
- size_t size;
-+ int i;
-
- size = sizeof (*team) + nthreads * sizeof (team->ordered_release[0]);
- team = gomp_malloc (size);
-- gomp_mutex_init (&team->work_share_lock);
-
-- team->work_shares = gomp_malloc (4 * sizeof (struct gomp_work_share *));
-- team->generation_mask = 3;
-- team->oldest_live_gen = work_share == NULL;
-- team->num_live_gen = work_share != NULL;
-- team->work_shares[0] = work_share;
-+ team->work_share_chunk = 8;
-+#ifdef HAVE_SYNC_BUILTINS
-+ team->single_count = 0;
-+#else
-+ gomp_mutex_init (&team->work_share_list_free_lock);
-+#endif
-+ gomp_init_work_share (&team->work_shares[0], false, nthreads);
-+ team->work_shares[0].next_alloc = NULL;
-+ team->work_share_list_free = NULL;
-+ team->work_share_list_alloc = &team->work_shares[1];
-+ for (i = 1; i < 7; i++)
-+ team->work_shares[i].next_free = &team->work_shares[i + 1];
-+ team->work_shares[i].next_free = NULL;
-
- team->nthreads = nthreads;
- gomp_barrier_init (&team->barrier, nthreads);
-@@ -164,10 +171,22 @@ new_team (unsigned nthreads, struct gomp
- static void
- free_team (struct gomp_team *team)
- {
-- free (team->work_shares);
-- gomp_mutex_destroy (&team->work_share_lock);
-+ if (__builtin_expect (team->work_shares[0].next_alloc != NULL, 0))
-+ {
-+ struct gomp_work_share *ws = team->work_shares[0].next_alloc;
-+ do
-+ {
-+ struct gomp_work_share *next_ws = ws->next_alloc;
-+ free (ws);
-+ ws = next_ws;
-+ }
-+ while (ws != NULL);
-+ }
- gomp_barrier_destroy (&team->barrier);
- gomp_sem_destroy (&team->master_release);
-+#ifndef HAVE_SYNC_BUILTINS
-+ gomp_mutex_destroy (&team->work_share_list_free_lock);
-+#endif
- free (team);
- }
-
-@@ -176,11 +195,10 @@ free_team (struct gomp_team *team)
-
- void
- gomp_team_start (void (*fn) (void *), void *data, unsigned nthreads,
-- struct gomp_work_share *work_share)
-+ struct gomp_team *team)
- {
- struct gomp_thread_start_data *start_data;
- struct gomp_thread *thr, *nthr;
-- struct gomp_team *team;
- bool nested;
- unsigned i, n, old_threads_used = 0;
- pthread_attr_t thread_attr, *attr;
-@@ -188,17 +206,18 @@ gomp_team_start (void (*fn) (void *), vo
- thr = gomp_thread ();
- nested = thr->ts.team != NULL;
-
-- team = new_team (nthreads, work_share);
--
- /* Always save the previous state, even if this isn't a nested team.
- In particular, we should save any work share state from an outer
- orphaned work share construct. */
- team->prev_ts = thr->ts;
-
- thr->ts.team = team;
-- thr->ts.work_share = work_share;
- thr->ts.team_id = 0;
-- thr->ts.work_share_generation = 0;
-+ thr->ts.work_share = &team->work_shares[0];
-+ thr->ts.last_work_share = NULL;
-+#ifdef HAVE_SYNC_BUILTINS
-+ thr->ts.single_count = 0;
-+#endif
- thr->ts.static_trip = 0;
-
- if (nthreads == 1)
-@@ -241,9 +260,12 @@ gomp_team_start (void (*fn) (void *), vo
- {
- nthr = gomp_threads[i];
- nthr->ts.team = team;
-- nthr->ts.work_share = work_share;
-+ nthr->ts.work_share = &team->work_shares[0];
-+ nthr->ts.last_work_share = NULL;
- nthr->ts.team_id = i;
-- nthr->ts.work_share_generation = 0;
-+#ifdef HAVE_SYNC_BUILTINS
-+ nthr->ts.single_count = 0;
-+#endif
- nthr->ts.static_trip = 0;
- nthr->fn = fn;
- nthr->data = data;
-@@ -266,8 +288,24 @@ gomp_team_start (void (*fn) (void *), vo
- }
- }
-
-+ if (__builtin_expect (nthreads > old_threads_used, 0))
-+ {
-+ long diff = (long) nthreads - (long) old_threads_used;
-+
-+ if (old_threads_used == 0)
-+ --diff;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+ __sync_fetch_and_add (&gomp_managed_threads, diff);
-+#else
-+ gomp_mutex_lock (&gomp_remaining_threads_lock);
-+ gomp_managed_threads += diff;
-+ gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+ }
-+
- attr = &gomp_thread_attr;
-- if (gomp_cpu_affinity != NULL)
-+ if (__builtin_expect (gomp_cpu_affinity != NULL, 0))
- {
- size_t stacksize;
- pthread_attr_init (&thread_attr);
-@@ -287,9 +325,12 @@ gomp_team_start (void (*fn) (void *), vo
- int err;
-
- start_data->ts.team = team;
-- start_data->ts.work_share = work_share;
-+ start_data->ts.work_share = &team->work_shares[0];
-+ start_data->ts.last_work_share = NULL;
- start_data->ts.team_id = i;
-- start_data->ts.work_share_generation = 0;
-+#ifdef HAVE_SYNC_BUILTINS
-+ start_data->ts.single_count = 0;
-+#endif
- start_data->ts.static_trip = 0;
- start_data->fn = fn;
- start_data->fn_data = data;
-@@ -303,7 +344,7 @@ gomp_team_start (void (*fn) (void *), vo
- gomp_fatal ("Thread creation failed: %s", strerror (err));
- }
-
-- if (gomp_cpu_affinity != NULL)
-+ if (__builtin_expect (gomp_cpu_affinity != NULL, 0))
- pthread_attr_destroy (&thread_attr);
-
- do_release:
-@@ -313,8 +354,20 @@ gomp_team_start (void (*fn) (void *), vo
- that should arrive back at the end of this team. The extra
- threads should be exiting. Note that we arrange for this test
- to never be true for nested teams. */
-- if (nthreads < old_threads_used)
-- gomp_barrier_reinit (&gomp_threads_dock, nthreads);
-+ if (__builtin_expect (nthreads < old_threads_used, 0))
-+ {
-+ long diff = (long) nthreads - (long) old_threads_used;
-+
-+ gomp_barrier_reinit (&gomp_threads_dock, nthreads);
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+ __sync_fetch_and_add (&gomp_managed_threads, diff);
-+#else
-+ gomp_mutex_lock (&gomp_remaining_threads_lock);
-+ gomp_managed_threads += diff;
-+ gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+ }
- }
-
-
-@@ -329,8 +382,21 @@ gomp_team_end (void)
-
- gomp_barrier_wait (&team->barrier);
-
-+ gomp_fini_work_share (thr->ts.work_share);
-+
- thr->ts = team->prev_ts;
-
-+ if (__builtin_expect (thr->ts.team != NULL, 0))
-+ {
-+#ifdef HAVE_SYNC_BUILTINS
-+ __sync_fetch_and_add (&gomp_managed_threads, 1L - team->nthreads);
-+#else
-+ gomp_mutex_lock (&gomp_remaining_threads_lock);
-+ gomp_managed_threads -= team->nthreads - 1L;
-+ gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+ }
-+
- free_team (team);
- }
-
---- libgomp/config/posix/bar.h.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/config/posix/bar.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -46,18 +46,32 @@ typedef struct
- unsigned total;
- unsigned arrived;
- } gomp_barrier_t;
-+typedef bool gomp_barrier_state_t;
-
- extern void gomp_barrier_init (gomp_barrier_t *, unsigned);
- extern void gomp_barrier_reinit (gomp_barrier_t *, unsigned);
- extern void gomp_barrier_destroy (gomp_barrier_t *);
-
- extern void gomp_barrier_wait (gomp_barrier_t *);
--extern void gomp_barrier_wait_end (gomp_barrier_t *, bool);
-+extern void gomp_barrier_wait_end (gomp_barrier_t *, gomp_barrier_state_t);
-
--static inline bool gomp_barrier_wait_start (gomp_barrier_t *bar)
-+static inline gomp_barrier_state_t
-+gomp_barrier_wait_start (gomp_barrier_t *bar)
- {
- gomp_mutex_lock (&bar->mutex1);
- return ++bar->arrived == bar->total;
- }
-
-+static inline bool
-+gomp_barrier_last_thread (gomp_barrier_state_t state)
-+{
-+ return state;
-+}
-+
-+static inline void
-+gomp_barrier_wait_last (gomp_barrier_t *bar)
-+{
-+ gomp_barrier_wait (bar);
-+}
-+
- #endif /* GOMP_BARRIER_H */
---- libgomp/config/posix/ptrlock.h.jj 2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/posix/ptrlock.h 2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+ Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+ This file is part of the GNU OpenMP Library (libgomp).
-+
-+ Libgomp is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1 of the License, or
-+ (at your option) any later version.
-+
-+ Libgomp 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 Lesser General Public License for
-+ more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with libgomp; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ MA 02110-1301, USA. */
-+
-+/* As a special exception, if you link this library with other files, some
-+ of which are compiled with GCC, to produce an executable, this library
-+ 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. */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+ mechanism for libgomp. This type is private to the library. This
-+ implementation uses atomic instructions and the futex syscall. */
-+
-+#ifndef GOMP_PTRLOCK_H
-+#define GOMP_PTRLOCK_H 1
-+
-+typedef struct { void *ptr; gomp_mutex_t lock; } gomp_ptrlock_t;
-+
-+static inline void gomp_ptrlock_init (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+ ptrlock->ptr = ptr;
-+ gomp_mutex_init (&ptrlock->lock);
-+}
-+
-+static inline void *gomp_ptrlock_get (gomp_ptrlock_t *ptrlock)
-+{
-+ if (ptrlock->ptr != NULL)
-+ return ptrlock->ptr;
-+
-+ gomp_mutex_lock (&ptrlock->lock);
-+ if (ptrlock->ptr != NULL)
-+ {
-+ gomp_mutex_unlock (&ptrlock->lock);
-+ return ptrlock->ptr;
-+ }
-+
-+ return NULL;
-+}
-+
-+static inline void gomp_ptrlock_set (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+ ptrlock->ptr = ptr;
-+ gomp_mutex_unlock (&ptrlock->lock);
-+}
-+
-+static inline void gomp_ptrlock_destroy (gomp_ptrlock_t *ptrlock)
-+{
-+ gomp_mutex_destroy (&ptrlock->lock);
-+}
-+
-+#endif /* GOMP_PTRLOCK_H */
---- libgomp/config/posix/ptrlock.c.jj 2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/posix/ptrlock.c 2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1 @@
-+/* Everything is in the header. */
---- libgomp/config/posix/bar.c.jj 2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/config/posix/bar.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -70,7 +70,7 @@ gomp_barrier_reinit (gomp_barrier_t *bar
- }
-
- void
--gomp_barrier_wait_end (gomp_barrier_t *bar, bool last)
-+gomp_barrier_wait_end (gomp_barrier_t *bar, gomp_barrier_state_t last)
- {
- unsigned int n;
-
---- libgomp/config/linux/alpha/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/alpha/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -30,8 +30,6 @@
- #ifndef SYS_futex
- #define SYS_futex 394
- #endif
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
-
-
- static inline void
-@@ -45,7 +43,7 @@ futex_wait (int *addr, int val)
-
- sc_0 = SYS_futex;
- sc_16 = (long) addr;
-- sc_17 = FUTEX_WAIT;
-+ sc_17 = gomp_futex_wait;
- sc_18 = val;
- sc_19 = 0;
- __asm volatile ("callsys"
-@@ -53,6 +51,20 @@ futex_wait (int *addr, int val)
- : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18), "1"(sc_19)
- : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
- "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+ if (__builtin_expect (sc_19, 0) && sc_0 == ENOSYS)
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sc_0 = SYS_futex;
-+ sc_17 &= ~FUTEX_PRIVATE_FLAG;
-+ sc_19 = 0;
-+ __asm volatile ("callsys"
-+ : "=r" (sc_0), "=r"(sc_19)
-+ : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18),
-+ "1"(sc_19)
-+ : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
-+ "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+ }
- }
-
- static inline void
-@@ -66,11 +78,35 @@ futex_wake (int *addr, int count)
-
- sc_0 = SYS_futex;
- sc_16 = (long) addr;
-- sc_17 = FUTEX_WAKE;
-+ sc_17 = gomp_futex_wake;
- sc_18 = count;
- __asm volatile ("callsys"
- : "=r" (sc_0), "=r"(sc_19)
- : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18)
- : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
- "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+ if (__builtin_expect (sc_19, 0) && sc_0 == ENOSYS)
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sc_0 = SYS_futex;
-+ sc_17 &= ~FUTEX_PRIVATE_FLAG;
-+ __asm volatile ("callsys"
-+ : "=r" (sc_0), "=r"(sc_19)
-+ : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18)
-+ : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
-+ "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+ }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+ __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+ __asm volatile ("wmb" : : : "memory");
- }
---- libgomp/config/linux/affinity.c.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/affinity.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-+/* Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
- Contributed by Jakub Jelinek <jakub@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -38,9 +38,6 @@
- #ifdef HAVE_PTHREAD_AFFINITY_NP
-
- static unsigned int affinity_counter;
--#ifndef HAVE_SYNC_BUILTINS
--static gomp_mutex_t affinity_lock;
--#endif
-
- void
- gomp_init_affinity (void)
-@@ -76,9 +73,6 @@ gomp_init_affinity (void)
- CPU_SET (gomp_cpu_affinity[0], &cpuset);
- pthread_setaffinity_np (pthread_self (), sizeof (cpuset), &cpuset);
- affinity_counter = 1;
--#ifndef HAVE_SYNC_BUILTINS
-- gomp_mutex_init (&affinity_lock);
--#endif
- }
-
- void
-@@ -87,13 +81,7 @@ gomp_init_thread_affinity (pthread_attr_
- unsigned int cpu;
- cpu_set_t cpuset;
-
--#ifdef HAVE_SYNC_BUILTINS
- cpu = __sync_fetch_and_add (&affinity_counter, 1);
--#else
-- gomp_mutex_lock (&affinity_lock);
-- cpu = affinity_counter++;
-- gomp_mutex_unlock (&affinity_lock);
--#endif
- cpu %= gomp_cpu_affinity_len;
- CPU_ZERO (&cpuset);
- CPU_SET (gomp_cpu_affinity[cpu], &cpuset);
---- libgomp/config/linux/bar.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/bar.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -36,40 +36,49 @@
-
- typedef struct
- {
-- gomp_mutex_t mutex;
-- unsigned total;
-- unsigned arrived;
-- int generation;
-+ /* Make sure total/generation is in a mostly read cacheline, while
-+ awaited in a separate cacheline. */
-+ unsigned total __attribute__((aligned (64)));
-+ unsigned generation;
-+ unsigned awaited __attribute__((aligned (64)));
- } gomp_barrier_t;
-+typedef unsigned int gomp_barrier_state_t;
-
- static inline void gomp_barrier_init (gomp_barrier_t *bar, unsigned count)
- {
-- gomp_mutex_init (&bar->mutex);
- bar->total = count;
-- bar->arrived = 0;
-+ bar->awaited = count;
- bar->generation = 0;
- }
-
- static inline void gomp_barrier_reinit (gomp_barrier_t *bar, unsigned count)
- {
-- gomp_mutex_lock (&bar->mutex);
-+ __sync_fetch_and_add (&bar->awaited, count - bar->total);
- bar->total = count;
-- gomp_mutex_unlock (&bar->mutex);
- }
-
- static inline void gomp_barrier_destroy (gomp_barrier_t *bar)
- {
-- /* Before destroying, make sure all threads have left the barrier. */
-- gomp_mutex_lock (&bar->mutex);
- }
-
- extern void gomp_barrier_wait (gomp_barrier_t *);
--extern void gomp_barrier_wait_end (gomp_barrier_t *, bool);
-+extern void gomp_barrier_wait_last (gomp_barrier_t *);
-+extern void gomp_barrier_wait_end (gomp_barrier_t *, gomp_barrier_state_t);
-
--static inline bool gomp_barrier_wait_start (gomp_barrier_t *bar)
-+static inline gomp_barrier_state_t
-+gomp_barrier_wait_start (gomp_barrier_t *bar)
- {
-- gomp_mutex_lock (&bar->mutex);
-- return ++bar->arrived == bar->total;
-+ unsigned int ret = bar->generation;
-+ /* Do we need any barrier here or is __sync_add_and_fetch acting
-+ as the needed LoadLoad barrier already? */
-+ ret += __sync_add_and_fetch (&bar->awaited, -1) == 0;
-+ return ret;
-+}
-+
-+static inline bool
-+gomp_barrier_last_thread (gomp_barrier_state_t state)
-+{
-+ return state & 1;
- }
-
- #endif /* GOMP_BARRIER_H */
---- libgomp/config/linux/ptrlock.h.jj 2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/ptrlock.h 2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,65 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+ Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+ This file is part of the GNU OpenMP Library (libgomp).
-+
-+ Libgomp is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1 of the License, or
-+ (at your option) any later version.
-+
-+ Libgomp 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 Lesser General Public License for
-+ more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with libgomp; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ MA 02110-1301, USA. */
-+
-+/* As a special exception, if you link this library with other files, some
-+ of which are compiled with GCC, to produce an executable, this library
-+ 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. */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+ mechanism for libgomp. This type is private to the library. This
-+ implementation uses atomic instructions and the futex syscall. */
-+
-+#ifndef GOMP_PTRLOCK_H
-+#define GOMP_PTRLOCK_H 1
-+
-+typedef void *gomp_ptrlock_t;
-+
-+static inline void gomp_ptrlock_init (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+ *ptrlock = ptr;
-+}
-+
-+extern void *gomp_ptrlock_get_slow (gomp_ptrlock_t *ptrlock);
-+static inline void *gomp_ptrlock_get (gomp_ptrlock_t *ptrlock)
-+{
-+ if ((uintptr_t) *ptrlock > 2)
-+ return *ptrlock;
-+
-+ if (__sync_bool_compare_and_swap (ptrlock, NULL, (uintptr_t) 1))
-+ return NULL;
-+
-+ return gomp_ptrlock_get_slow (ptrlock);
-+}
-+
-+extern void gomp_ptrlock_set_slow (gomp_ptrlock_t *ptrlock, void *ptr);
-+static inline void gomp_ptrlock_set (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+ if (!__sync_bool_compare_and_swap (ptrlock, (uintptr_t) 1, ptr))
-+ gomp_ptrlock_set_slow (ptrlock, ptr);
-+}
-+
-+static inline void gomp_ptrlock_destroy (gomp_ptrlock_t *ptrlock)
-+{
-+}
-+
-+#endif /* GOMP_PTRLOCK_H */
---- libgomp/config/linux/lock.c.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/lock.c 2008-03-26 15:11:32.000000000 +0100
-@@ -29,11 +29,10 @@
- primitives. This implementation uses atomic instructions and the futex
- syscall. */
-
--#include "libgomp.h"
- #include <string.h>
- #include <unistd.h>
- #include <sys/syscall.h>
--#include "futex.h"
-+#include "wait.h"
-
-
- /* The internal gomp_mutex_t and the external non-recursive omp_lock_t
-@@ -137,7 +136,7 @@ omp_set_nest_lock (omp_nest_lock_t *lock
- return;
- }
-
-- futex_wait (&lock->owner, otid);
-+ do_wait (&lock->owner, otid);
- }
- }
-
---- libgomp/config/linux/ptrlock.c.jj 2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/ptrlock.c 2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,70 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+ Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+ This file is part of the GNU OpenMP Library (libgomp).
-+
-+ Libgomp is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1 of the License, or
-+ (at your option) any later version.
-+
-+ Libgomp 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 Lesser General Public License for
-+ more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with libgomp; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ MA 02110-1301, USA. */
-+
-+/* As a special exception, if you link this library with other files, some
-+ of which are compiled with GCC, to produce an executable, this library
-+ 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. */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+ mechanism for libgomp. This type is private to the library. This
-+ implementation uses atomic instructions and the futex syscall. */
-+
-+#include <endian.h>
-+#include <limits.h>
-+#include "wait.h"
-+
-+void *
-+gomp_ptrlock_get_slow (gomp_ptrlock_t *ptrlock)
-+{
-+ int *intptr;
-+ __sync_bool_compare_and_swap (ptrlock, 1, 2);
-+
-+ /* futex works on ints, not pointers.
-+ But a valid work share pointer will be at least
-+ 8 byte aligned, so it is safe to assume the low
-+ 32-bits of the pointer won't contain values 1 or 2. */
-+ __asm volatile ("" : "=r" (intptr) : "0" (ptrlock));
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+ if (sizeof (*ptrlock) > sizeof (int))
-+ intptr += (sizeof (*ptrlock) / sizeof (int)) - 1;
-+#endif
-+ do
-+ do_wait (intptr, 2);
-+ while (*intptr == 2);
-+ __asm volatile ("" : : : "memory");
-+ return *ptrlock;
-+}
-+
-+void
-+gomp_ptrlock_set_slow (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+ int *intptr;
-+
-+ *ptrlock = ptr;
-+ __asm volatile ("" : "=r" (intptr) : "0" (ptrlock));
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+ if (sizeof (*ptrlock) > sizeof (int))
-+ intptr += (sizeof (*ptrlock) / sizeof (int)) - 1;
-+#endif
-+ futex_wake (intptr, INT_MAX);
-+}
---- libgomp/config/linux/x86/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/x86/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -27,9 +27,6 @@
-
- /* Provide target-specific access to the futex system call. */
-
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
--
- #ifdef __LP64__
- # ifndef SYS_futex
- # define SYS_futex 202
-@@ -38,14 +35,26 @@
- static inline void
- futex_wait (int *addr, int val)
- {
-- register long r10 __asm__("%r10") = 0;
-+ register long r10 __asm__("%r10");
- long res;
-
-+ r10 = 0;
- __asm volatile ("syscall"
- : "=a" (res)
-- : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAIT),
-- "d"(val), "r"(r10)
-+ : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wait),
-+ "d" (val), "r" (r10)
- : "r11", "rcx", "memory");
-+ if (__builtin_expect (res == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ r10 = 0;
-+ __asm volatile ("syscall"
-+ : "=a" (res)
-+ : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wait),
-+ "d" (val), "r" (r10)
-+ : "r11", "rcx", "memory");
-+ }
- }
-
- static inline void
-@@ -55,8 +64,19 @@ futex_wake (int *addr, int count)
-
- __asm volatile ("syscall"
- : "=a" (res)
-- : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE), "d"(count)
-+ : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wake),
-+ "d" (count)
- : "r11", "rcx", "memory");
-+ if (__builtin_expect (res == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ __asm volatile ("syscall"
-+ : "=a" (res)
-+ : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wake),
-+ "d" (count)
-+ : "r11", "rcx", "memory");
-+ }
- }
- #else
- # ifndef SYS_futex
-@@ -65,7 +85,7 @@ futex_wake (int *addr, int count)
-
- # ifdef __PIC__
-
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
- long res;
-@@ -77,11 +97,12 @@ sys_futex0 (int *addr, int op, int val)
- : "0"(SYS_futex), "r" (addr), "c"(op),
- "d"(val), "S"(0)
- : "memory");
-+ return res;
- }
-
- # else
-
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
- long res;
-@@ -91,6 +112,7 @@ sys_futex0 (int *addr, int op, int val)
- : "0"(SYS_futex), "b" (addr), "c"(op),
- "d"(val), "S"(0)
- : "memory");
-+ return res;
- }
-
- # endif /* __PIC__ */
-@@ -98,13 +120,37 @@ sys_futex0 (int *addr, int op, int val)
- static inline void
- futex_wait (int *addr, int val)
- {
-- sys_futex0 (addr, FUTEX_WAIT, val);
-+ long res = sys_futex0 (addr, gomp_futex_wait, val);
-+ if (__builtin_expect (res == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wait, val);
-+ }
- }
-
- static inline void
- futex_wake (int *addr, int count)
- {
-- sys_futex0 (addr, FUTEX_WAKE, count);
-+ long res = sys_futex0 (addr, gomp_futex_wake, count);
-+ if (__builtin_expect (res == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wake, count);
-+ }
- }
-
- #endif /* __LP64__ */
-+
-+static inline void
-+cpu_relax (void)
-+{
-+ __asm volatile ("rep; nop" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+ __sync_synchronize ();
-+}
---- libgomp/config/linux/wait.h.jj 2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/wait.h 2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,68 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+ Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+ This file is part of the GNU OpenMP Library (libgomp).
-+
-+ Libgomp is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1 of the License, or
-+ (at your option) any later version.
-+
-+ Libgomp 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 Lesser General Public License for
-+ more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with libgomp; see the file COPYING.LIB. If not, write to the
-+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ MA 02110-1301, USA. */
-+
-+/* As a special exception, if you link this library with other files, some
-+ of which are compiled with GCC, to produce an executable, this library
-+ 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. */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+ mechanism for libgomp. This type is private to the library. This
-+ implementation uses atomic instructions and the futex syscall. */
-+
-+#ifndef GOMP_WAIT_H
-+#define GOMP_WAIT_H 1
-+
-+#include "libgomp.h"
-+#include <errno.h>
-+
-+#define FUTEX_WAIT 0
-+#define FUTEX_WAKE 1
-+#define FUTEX_PRIVATE_FLAG 128L
-+
-+#ifdef HAVE_ATTRIBUTE_VISIBILITY
-+# pragma GCC visibility push(hidden)
-+#endif
-+
-+extern long int gomp_futex_wait, gomp_futex_wake;
-+
-+#include "futex.h"
-+
-+static inline void do_wait (int *addr, int val)
-+{
-+ unsigned long long i, count = gomp_spin_count_var;
-+
-+ if (__builtin_expect (gomp_managed_threads > gomp_available_cpus, 0))
-+ count = gomp_throttled_spin_count_var;
-+ for (i = 0; i < count; i++)
-+ if (__builtin_expect (*addr != val, 0))
-+ return;
-+ else
-+ cpu_relax ();
-+ futex_wait (addr, val);
-+}
-+
-+#ifdef HAVE_ATTRIBUTE_VISIBILITY
-+# pragma GCC visibility pop
-+#endif
-+
-+#endif /* GOMP_WAIT_H */
---- libgomp/config/linux/sparc/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/sparc/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Jakub Jelinek <jakub@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call. */
-
- #include <sys/syscall.h>
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
-
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
- register long int g1 __asm__ ("g1");
-@@ -47,9 +45,9 @@ sys_futex0 (int *addr, int op, int val)
- o3 = 0;
-
- #ifdef __arch64__
--# define SYSCALL_STRING "ta\t0x6d"
-+# define SYSCALL_STRING "ta\t0x6d; bcs,a,pt %%xcc, 1f; sub %%g0, %%o0, %%o0; 1:"
- #else
--# define SYSCALL_STRING "ta\t0x10"
-+# define SYSCALL_STRING "ta\t0x10; bcs,a 1f; sub %%g0, %%o0, %%o0; 1:"
- #endif
-
- __asm volatile (SYSCALL_STRING
-@@ -65,16 +63,49 @@ sys_futex0 (int *addr, int op, int val)
- "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62",
- #endif
- "cc", "memory");
-+ return o0;
- }
-
- static inline void
- futex_wait (int *addr, int val)
- {
-- sys_futex0 (addr, FUTEX_WAIT, val);
-+ long err = sys_futex0 (addr, gomp_futex_wait, val);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wait, val);
-+ }
- }
-
- static inline void
- futex_wake (int *addr, int count)
- {
-- sys_futex0 (addr, FUTEX_WAKE, count);
-+ long err = sys_futex0 (addr, gomp_futex_wake, count);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wake, count);
-+ }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+#if defined __arch64__ || defined __sparc_v9__
-+ __asm volatile ("membar #LoadLoad" : : : "memory");
-+#else
-+ __asm volatile ("" : : : "memory");
-+#endif
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+#if defined __arch64__ || defined __sparc_v9__
-+ __asm volatile ("membar #StoreStore" : : : "memory");
-+#else
-+ __sync_synchronize ();
-+#endif
- }
---- libgomp/config/linux/ia64/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/ia64/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,23 +29,24 @@
-
- #include <sys/syscall.h>
-
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
-
-
--static inline void
--sys_futex0(int *addr, int op, int val)
-+static inline long
-+sys_futex0(int *addr, long op, int val)
- {
- register long out0 asm ("out0") = (long) addr;
- register long out1 asm ("out1") = op;
- register long out2 asm ("out2") = val;
- register long out3 asm ("out3") = 0;
-+ register long r8 asm ("r8");
-+ register long r10 asm ("r10");
- register long r15 asm ("r15") = SYS_futex;
-
- __asm __volatile ("break 0x100000"
-- : "=r"(r15), "=r"(out0), "=r"(out1), "=r"(out2), "=r"(out3)
-+ : "=r"(r15), "=r"(out0), "=r"(out1), "=r"(out2), "=r"(out3),
-+ "=r"(r8), "=r"(r10)
- : "r"(r15), "r"(out0), "r"(out1), "r"(out2), "r"(out3)
-- : "memory", "r8", "r10", "out4", "out5", "out6", "out7",
-+ : "memory", "out4", "out5", "out6", "out7",
- /* Non-stacked integer registers, minus r8, r10, r15. */
- "r2", "r3", "r9", "r11", "r12", "r13", "r14", "r16", "r17", "r18",
- "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27",
-@@ -56,16 +57,41 @@ sys_futex0(int *addr, int op, int val)
- "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
- /* Branch registers. */
- "b6");
-+ return r8 & r10;
- }
-
- static inline void
- futex_wait (int *addr, int val)
- {
-- sys_futex0 (addr, FUTEX_WAIT, val);
-+ long err = sys_futex0 (addr, gomp_futex_wait, val);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wait, val);
-+ }
- }
-
- static inline void
- futex_wake (int *addr, int count)
- {
-- sys_futex0 (addr, FUTEX_WAKE, count);
-+ long err = sys_futex0 (addr, gomp_futex_wake, count);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wake, count);
-+ }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+ __asm volatile ("hint @pause" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+ __sync_synchronize ();
- }
---- libgomp/config/linux/s390/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/s390/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Jakub Jelinek <jakub@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call. */
-
- #include <sys/syscall.h>
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
-
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
- register long int gpr2 __asm__ ("2");
-@@ -49,16 +47,41 @@ sys_futex0 (int *addr, int op, int val)
- : "i" (SYS_futex),
- "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5)
- : "memory");
-+ return gpr2;
- }
-
- static inline void
- futex_wait (int *addr, int val)
- {
-- sys_futex0 (addr, FUTEX_WAIT, val);
-+ long err = sys_futex0 (addr, gomp_futex_wait, val);
-+ if (__builtin_expect (err == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wait, val);
-+ }
- }
-
- static inline void
- futex_wake (int *addr, int count)
- {
-- sys_futex0 (addr, FUTEX_WAKE, count);
-+ long err = sys_futex0 (addr, gomp_futex_wake, count);
-+ if (__builtin_expect (err == -ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wake, count);
-+ }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+ __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+ __sync_synchronize ();
- }
---- libgomp/config/linux/mutex.c.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/mutex.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,9 +29,10 @@
- mechanism for libgomp. This type is private to the library. This
- implementation uses atomic instructions and the futex syscall. */
-
--#include "libgomp.h"
--#include "futex.h"
-+#include "wait.h"
-
-+long int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
-+long int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
-
- void
- gomp_mutex_lock_slow (gomp_mutex_t *mutex)
-@@ -40,7 +41,7 @@ gomp_mutex_lock_slow (gomp_mutex_t *mute
- {
- int oldval = __sync_val_compare_and_swap (mutex, 1, 2);
- if (oldval != 0)
-- futex_wait (mutex, 2);
-+ do_wait (mutex, 2);
- }
- while (!__sync_bool_compare_and_swap (mutex, 0, 2));
- }
---- libgomp/config/linux/sem.c.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/sem.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,8 +29,7 @@
- mechanism for libgomp. This type is private to the library. This
- implementation uses atomic instructions and the futex syscall. */
-
--#include "libgomp.h"
--#include "futex.h"
-+#include "wait.h"
-
-
- void
-@@ -44,7 +43,7 @@ gomp_sem_wait_slow (gomp_sem_t *sem)
- if (__sync_bool_compare_and_swap (sem, val, val - 1))
- return;
- }
-- futex_wait (sem, -1);
-+ do_wait (sem, -1);
- }
- }
-
---- libgomp/config/linux/powerpc/futex.h.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/powerpc/futex.h 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call. */
-
- #include <sys/syscall.h>
--#define FUTEX_WAIT 0
--#define FUTEX_WAKE 1
-
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
- register long int r0 __asm__ ("r0");
-@@ -50,21 +48,48 @@ sys_futex0 (int *addr, int op, int val)
- doesn't. It doesn't much matter for us. In the interest of unity,
- go ahead and clobber it always. */
-
-- __asm volatile ("sc"
-+ __asm volatile ("sc; mfcr %0"
- : "=r"(r0), "=r"(r3), "=r"(r4), "=r"(r5), "=r"(r6)
- : "r"(r0), "r"(r3), "r"(r4), "r"(r5), "r"(r6)
- : "r7", "r8", "r9", "r10", "r11", "r12",
- "cr0", "ctr", "memory");
-+ if (__builtin_expect (r0 & (1 << 28), 0))
-+ return r3;
-+ return 0;
- }
-
- static inline void
- futex_wait (int *addr, int val)
- {
-- sys_futex0 (addr, FUTEX_WAIT, val);
-+ long err = sys_futex0 (addr, gomp_futex_wait, val);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wait, val);
-+ }
- }
-
- static inline void
- futex_wake (int *addr, int count)
- {
-- sys_futex0 (addr, FUTEX_WAKE, count);
-+ long err = sys_futex0 (addr, gomp_futex_wake, count);
-+ if (__builtin_expect (err == ENOSYS, 0))
-+ {
-+ gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+ gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+ sys_futex0 (addr, gomp_futex_wake, count);
-+ }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+ __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+ __asm volatile ("eieio" : : : "memory");
- }
---- libgomp/config/linux/bar.c.jj 2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/bar.c 2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
- Contributed by Richard Henderson <rth@redhat.com>.
-
- This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,32 +29,29 @@
- mechanism for libgomp. This type is private to the library. This
- implementation uses atomic instructions and the futex syscall. */
-
--#include "libgomp.h"
--#include "futex.h"
- #include <limits.h>
-+#include "wait.h"
-
-
- void
--gomp_barrier_wait_end (gomp_barrier_t *bar, bool last)
-+gomp_barrier_wait_end (gomp_barrier_t *bar, gomp_barrier_state_t state)
- {
-- if (last)
-+ if (__builtin_expect ((state & 1) != 0, 0))
- {
-- bar->generation++;
-- futex_wake (&bar->generation, INT_MAX);
-+ /* Next time we'll be awaiting TOTAL threads again. */
-+ bar->awaited = bar->total;
-+ atomic_write_barrier ();
-+ bar->generation += 2;
-+ futex_wake ((int *) &bar->generation, INT_MAX);
- }
- else
- {
-- unsigned int generation = bar->generation;
--
-- gomp_mutex_unlock (&bar->mutex);
-+ unsigned int generation = state;
-
- do
-- futex_wait (&bar->generation, generation);
-+ do_wait ((int *) &bar->generation, generation);
- while (bar->generation == generation);
- }
--
-- if (__sync_add_and_fetch (&bar->arrived, -1) == 0)
-- gomp_mutex_unlock (&bar->mutex);
- }
-
- void
-@@ -62,3 +59,18 @@ gomp_barrier_wait (gomp_barrier_t *barri
- {
- gomp_barrier_wait_end (barrier, gomp_barrier_wait_start (barrier));
- }
-+
-+/* Like gomp_barrier_wait, except that if the encountering thread
-+ is not the last one to hit the barrier, it returns immediately.
-+ The intended usage is that a thread which intends to gomp_barrier_destroy
-+ this barrier calls gomp_barrier_wait, while all other threads
-+ call gomp_barrier_wait_last. When gomp_barrier_wait returns,
-+ the barrier can be safely destroyed. */
-+
-+void
-+gomp_barrier_wait_last (gomp_barrier_t *barrier)
-+{
-+ gomp_barrier_state_t state = gomp_barrier_wait_start (barrier);
-+ if (state & 1)
-+ gomp_barrier_wait_end (barrier, state);
-+}
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch
deleted file mode 100644
index 3de4158eb..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-2005-11-28 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,
- read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx
- instead of doing an extran indirection from frame_pointer_rtx.
-
- * gcc.dg/20051128-1.c: New test.
-
-Index: gcc/config/rs6000/rs6000.c
-===================================================================
---- gcc/config/rs6000/rs6000.c.orig 2010-03-27 03:27:39.000000000 -0700
-+++ gcc/config/rs6000/rs6000.c 2010-06-25 10:18:04.053381930 -0700
-@@ -17646,17 +17646,22 @@
- don't try to be too clever here. */
- if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic))
- {
-+ rtx x;
- cfun->machine->ra_needs_full_frame = 1;
-
-- return
-- gen_rtx_MEM
-- (Pmode,
-- memory_address
-- (Pmode,
-- plus_constant (copy_to_reg
-- (gen_rtx_MEM (Pmode,
-- memory_address (Pmode, frame))),
-- RETURN_ADDRESS_OFFSET)));
-+ if (count == 0)
-+ {
-+ gcc_assert (frame == frame_pointer_rtx);
-+ x = arg_pointer_rtx;
-+ }
-+ else
-+ {
-+ x = memory_address (Pmode, frame);
-+ x = copy_to_reg (gen_rtx_MEM (Pmode, x));
-+ }
-+
-+ x = plus_constant (x, RETURN_ADDRESS_OFFSET);
-+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));
- }
-
- cfun->machine->ra_need_lr = 1;
-Index: gcc/testsuite/gcc.dg/20051128-1.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.dg/20051128-1.c 2010-06-25 10:18:04.061382856 -0700
-@@ -0,0 +1,41 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2 -fpic" } */
-+
-+extern void exit (int);
-+extern void abort (void);
-+
-+int b;
-+
-+struct A
-+{
-+ void *pad[147];
-+ void *ra, *h;
-+ long o;
-+};
-+
-+void
-+__attribute__((noinline))
-+foo (struct A *a, void *x)
-+{
-+ __builtin_memset (a, 0, sizeof (a));
-+ if (!b)
-+ exit (0);
-+}
-+
-+void
-+__attribute__((noinline))
-+bar (void)
-+{
-+ struct A a;
-+
-+ __builtin_unwind_init ();
-+ foo (&a, __builtin_return_address (0));
-+}
-+
-+int
-+main (void)
-+{
-+ bar ();
-+ abort ();
-+ return 0;
-+}
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch
deleted file mode 100644
index 172bb8117..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2006-08-18 Jakub Jelinek <jakub@redhat.com>
-
- PR c/27898
- * gcc.dg/pr27898.c: New test.
-
---- gcc/testsuite/gcc.dg/pr27898.c.jj 2006-08-18 09:19:33.000000000 +0200
-+++ gcc/testsuite/gcc.dg/pr27898.c 2006-08-18 09:19:27.000000000 +0200
-@@ -0,0 +1,8 @@
-+/* PR c/27898 */
-+/* { dg-do compile } */
-+/* { dg-options "--combine" } */
-+/* { dg-additional-sources "pr27898.c" } */
-+
-+union u { struct { int i; }; };
-+
-+extern int foo (union u *);
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch
deleted file mode 100644
index f35696703..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2007-06-01 Jakub Jelinek <jakub@redhat.com>
-
- PR tree-optimization/32139
- * gcc.c-torture/compile/20070531-1.c: New test.
-
---- gcc/testsuite/gcc.c-torture/compile/20070531-1.c.jj 2007-05-31 13:47:22.000000000 +0200
-+++ gcc/testsuite/gcc.c-torture/compile/20070531-1.c 2007-06-01 10:57:15.000000000 +0200
-@@ -0,0 +1,11 @@
-+/* PR tree-optimization/32139 */
-+int foo (void);
-+int bar (void) __attribute__ ((const));
-+
-+int
-+test (int x)
-+{
-+ int a = (x == 10000 ? foo : bar) ();
-+ int b = (x == 10000 ? foo : bar) ();
-+ return a + b;
-+}
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch
deleted file mode 100644
index 68c30650f..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-2007-11-06 Jakub Jelinek <jakub@redhat.com>
-
- PR tree-optimization/33763
- * gcc.dg/pr33763.c: New test.
- * g++.dg/opt/inline13.C: New test.
-
-2007-11-06 Jan Hubicka <jh@suse.cz>
-
- PR tree-optimization/33763
- * tree-inline.c (expand_call_inline): Silently ignore always_inline
- attribute for redefined extern inline functions.
-
-Index: gcc/tree-inline.c
-===================================================================
---- gcc/tree-inline.c.orig 2010-03-18 13:07:13.000000000 -0700
-+++ gcc/tree-inline.c 2010-06-25 10:18:51.230139825 -0700
-@@ -3545,6 +3545,12 @@
- goto egress;
-
- if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
-+ /* For extern inline functions that get redefined we always
-+ silently ignored alway_inline flag. Better behaviour would
-+ be to be able to keep both bodies and use extern inline body
-+ for inlining, but we can't do that because frontends overwrite
-+ the body. */
-+ && !cg_edge->callee->local.redefined_extern_inline
- /* Avoid warnings during early inline pass. */
- && cgraph_global_info_ready)
- {
-Index: gcc/testsuite/gcc.dg/pr33763.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.dg/pr33763.c 2010-06-25 10:18:51.234141302 -0700
-@@ -0,0 +1,60 @@
-+/* PR tree-optimization/33763 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+typedef struct
-+{
-+ void *a;
-+ void *b;
-+} T;
-+extern void *foo (const char *, const char *);
-+extern void *bar (void *, const char *, T);
-+extern int baz (const char *, int);
-+
-+extern inline __attribute__ ((always_inline, gnu_inline)) int
-+baz (const char *x, int y)
-+{
-+ return 2;
-+}
-+
-+int
-+baz (const char *x, int y)
-+{
-+ return 1;
-+}
-+
-+int xa, xb;
-+
-+static void *
-+inl (const char *x, const char *y)
-+{
-+ T t = { &xa, &xb };
-+ int *f = (int *) __builtin_malloc (sizeof (int));
-+ const char *z;
-+ int o = 0;
-+ void *r = 0;
-+
-+ for (z = y; *z; z++)
-+ {
-+ if (*z == 'r')
-+ o |= 1;
-+ if (*z == 'w')
-+ o |= 2;
-+ }
-+ if (o == 1)
-+ *f = baz (x, 0);
-+ if (o == 2)
-+ *f = baz (x, 1);
-+ if (o == 3)
-+ *f = baz (x, 2);
-+
-+ if (o && *f > 0)
-+ r = bar (f, "w", t);
-+ return r;
-+}
-+
-+void *
-+foo (const char *x, const char *y)
-+{
-+ return inl (x, y);
-+}
-Index: gcc/testsuite/g++.dg/opt/inline13.C
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/g++.dg/opt/inline13.C 2010-06-25 10:18:51.261052137 -0700
-@@ -0,0 +1,60 @@
-+// PR tree-optimization/33763
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+typedef struct
-+{
-+ void *a;
-+ void *b;
-+} T;
-+extern void *foo (const char *, const char *);
-+extern void *bar (void *, const char *, T);
-+extern int baz (const char *, int);
-+
-+extern inline __attribute__ ((always_inline, gnu_inline)) int
-+baz (const char *x, int y)
-+{
-+ return 2;
-+}
-+
-+int
-+baz (const char *x, int y)
-+{
-+ return 1;
-+}
-+
-+int xa, xb;
-+
-+static void *
-+inl (const char *x, const char *y)
-+{
-+ T t = { &xa, &xb };
-+ int *f = (int *) __builtin_malloc (sizeof (int));
-+ const char *z;
-+ int o = 0;
-+ void *r = 0;
-+
-+ for (z = y; *z; z++)
-+ {
-+ if (*z == 'r')
-+ o |= 1;
-+ if (*z == 'w')
-+ o |= 2;
-+ }
-+ if (o == 1)
-+ *f = baz (x, 0);
-+ if (o == 2)
-+ *f = baz (x, 1);
-+ if (o == 3)
-+ *f = baz (x, 2);
-+
-+ if (o && *f > 0)
-+ r = bar (f, "w", t);
-+ return r;
-+}
-+
-+void *
-+foo (const char *x, const char *y)
-+{
-+ return inl (x, y);
-+}
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch
deleted file mode 100644
index e96ae6f13..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-2008-04-01 Jakub Jelinek <jakub@redhat.com>
-
- PR pch/13675
- * files.c (struct _cpp_file): Remove pch field.
- (pch_open_file): Don't set file->pch, just file->pchname.
- (should_stack_file): After pfile->cb.read_pch call
- free pchname and clear pchname, don't close file->fd.
- Test file->pchname instead of file->pch. Don't close fd after cb.
- (_cpp_stack_include): Test file->pchname instead of file->pch.
-
- * c-pch.c (c_common_read_pch): On error close (fd) resp. fclose (f).
-
---- libcpp/files.c.jj 2008-02-18 23:50:17.000000000 +0100
-+++ libcpp/files.c 2008-03-31 15:59:01.000000000 +0200
-@@ -106,9 +106,6 @@ struct _cpp_file
-
- /* If BUFFER above contains the true contents of the file. */
- bool buffer_valid;
--
-- /* File is a PCH (on return from find_include_file). */
-- bool pch;
- };
-
- /* A singly-linked list for all searches for a given file name, with
-@@ -322,9 +319,7 @@ pch_open_file (cpp_reader *pfile, _cpp_f
- }
- closedir (pchdir);
- }
-- if (valid)
-- file->pch = true;
-- else
-+ if (!valid)
- *invalid_pch = true;
- }
-
-@@ -703,11 +698,12 @@ should_stack_file (cpp_reader *pfile, _c
- return false;
-
- /* Handle PCH files immediately; don't stack them. */
-- if (file->pch)
-+ if (file->pchname)
- {
- pfile->cb.read_pch (pfile, file->pchname, file->fd, file->path);
-- close (file->fd);
- file->fd = -1;
-+ free ((void *) file->pchname);
-+ file->pchname = NULL;
- return false;
- }
-
-@@ -916,7 +912,7 @@ _cpp_stack_include (cpp_reader *pfile, c
- complicates LAST_SOURCE_LINE_LOCATION. This does not apply if we
- found a PCH file (in which case linemap_add is not called) or we
- were included from the command-line. */
-- if (! file->pch && file->err_no == 0 && type != IT_CMDLINE)
-+ if (file->pchname == NULL && file->err_no == 0 && type != IT_CMDLINE)
- pfile->line_table->highest_location--;
-
- return _cpp_stack_file (pfile, file, type == IT_IMPORT);
---- gcc/c-pch.c.jj 2008-02-18 23:46:08.000000000 +0100
-+++ gcc/c-pch.c 2008-03-31 15:56:00.000000000 +0200
-@@ -372,6 +372,7 @@ c_common_read_pch (cpp_reader *pfile, co
- if (f == NULL)
- {
- cpp_errno (pfile, CPP_DL_ERROR, "calling fdopen");
-+ close (fd);
- return;
- }
-
-@@ -380,6 +381,7 @@ c_common_read_pch (cpp_reader *pfile, co
- if (fread (&h, sizeof (h), 1, f) != 1)
- {
- cpp_errno (pfile, CPP_DL_ERROR, "reading");
-+ fclose (f);
- return;
- }
-
-@@ -425,7 +427,10 @@ c_common_read_pch (cpp_reader *pfile, co
- gt_pch_restore (f);
-
- if (cpp_read_state (pfile, name, f, smd) != 0)
-- return;
-+ {
-+ fclose (f);
-+ return;
-+ }
-
- fclose (f);
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch
deleted file mode 100644
index 4888ac47d..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-2007-10-16 Jakub Jelinek <jakub@redhat.com>
-
- * Makefile.am (libgcj_tools_la_LIBADD): Add.
- * Makefile.in: Regenerated.
-
-Index: libjava/Makefile.am
-===================================================================
---- libjava/Makefile.am.orig 2010-03-21 12:41:37.000000000 -0700
-+++ libjava/Makefile.am 2010-06-25 10:22:11.394130458 -0700
-@@ -507,6 +507,8 @@
- libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
- -fno-bootstrap-classes -fno-indirect-classes \
- -fsource-filename=$(here)/classpath/tools/all-classes.lst
-+## See jv_convert_LDADD.
-+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
- libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in.orig 2010-04-02 11:18:06.000000000 -0700
-+++ libjava/Makefile.in 2010-06-25 10:27:41.841708512 -0700
-@@ -1190,7 +1190,7 @@
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
-
--libgcj_tools_la_LIBADD = libgcj.la -lm
-+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la -lm
- libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22)
- libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS)
- libjvm_la_SOURCES = jni-libjvm.cc
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch
deleted file mode 100644
index 7e2801b99..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-2007-10-21 Jakub Jelinek <jakub@redhat.com>
-
- * doc/Makefile.am (POD2MAN): Set date from cp-tools.texinfo
- timestamp rather than from current date.
- * doc/Makefile.in: Regenerated.
-
-Index: libjava/classpath/doc/Makefile.am
-===================================================================
---- libjava/classpath/doc/Makefile.am.orig 2008-10-21 10:55:01.000000000 -0700
-+++ libjava/classpath/doc/Makefile.am 2010-06-25 10:28:30.237631599 -0700
-@@ -31,7 +31,7 @@
- gtnameserv.1 \
- gjdoc.1
-
--POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
-+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
- TEXI2POD = perl $(srcdir)/texi2pod.pl
- STAMP = echo timestamp >
-
-Index: libjava/classpath/doc/Makefile.in
-===================================================================
---- libjava/classpath/doc/Makefile.in.orig 2010-04-02 11:18:06.000000000 -0700
-+++ libjava/classpath/doc/Makefile.in 2010-06-25 10:28:30.245635728 -0700
-@@ -376,7 +376,7 @@
- gtnameserv.1 \
- gjdoc.1
-
--POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
-+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
- TEXI2POD = perl $(srcdir)/texi2pod.pl
- STAMP = echo timestamp >
- @GENINSRC_FALSE@STAMP_GENINSRC =
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc45-no-add-needed.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc45-no-add-needed.patch
deleted file mode 100644
index bf03c2785..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fedora/gcc45-no-add-needed.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-2010-02-08 Roland McGrath <roland@redhat.com>
-
- * config/rs6000/sysv4.h (LINK_EH_SPEC): Pass --no-add-needed to the
- linker.
- * config/linux.h (LINK_EH_SPEC): Likewise.
- * config/alpha/elf.h (LINK_EH_SPEC): Likewise.
- * config/ia64/linux.h (LINK_EH_SPEC): Likewise.
-
-Index: gcc/config/alpha/elf.h
-===================================================================
---- gcc/config/alpha/elf.h.orig 2011-06-16 17:58:47.000000000 -0700
-+++ gcc/config/alpha/elf.h 2011-09-17 11:04:57.033298875 -0700
-@@ -441,7 +441,7 @@ extern int alpha_this_gpdisp_sequence_nu
- I imagine that other systems will catch up. In the meantime, it
- doesn't harm to make sure that the data exists to be used later. */
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
-
- /* A C statement (sans semicolon) to output to the stdio stream STREAM
-Index: gcc/config/ia64/linux.h
-===================================================================
---- gcc/config/ia64/linux.h.orig 2011-09-17 11:03:19.000000000 -0700
-+++ gcc/config/ia64/linux.h 2011-09-17 11:04:57.033298875 -0700
-@@ -80,7 +80,7 @@ do { \
- Signalize that because we have fde-glibc, we don't need all C shared libs
- linked against -lgcc_s. */
- #undef LINK_EH_SPEC
--#define LINK_EH_SPEC ""
-+#define LINK_EH_SPEC "--no-add-needed "
-
- #define MD_UNWIND_SUPPORT "config/ia64/linux-unwind.h"
-
-Index: gcc/config/linux.h
-===================================================================
---- gcc/config/linux.h.orig 2011-09-17 11:03:38.000000000 -0700
-+++ gcc/config/linux.h 2011-09-17 11:04:57.033298875 -0700
-@@ -101,7 +101,7 @@ see the files COPYING3 and COPYING.RUNTI
- } while (0)
-
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
-
- /* Define this so we can compile MS code for use with WINE. */
-Index: gcc/config/rs6000/sysv4.h
-===================================================================
---- gcc/config/rs6000/sysv4.h.orig 2011-09-17 11:03:41.000000000 -0700
-+++ gcc/config/rs6000/sysv4.h 2011-09-17 11:05:58.653298861 -0700
-@@ -908,7 +908,7 @@ SVR4_ASM_SPEC \
-
- #if defined(HAVE_LD_EH_FRAME_HDR)
- # undef LINK_EH_SPEC
--# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+# define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
-
- #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch
deleted file mode 100644
index 348c77006..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
- used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
- directory.
-
-Index: gcc-4.5+svnr155514/libgfortran/configure
-===================================================================
---- gcc-4.5+svnr155514.orig/libgfortran/configure 2009-12-29 22:02:01.000000000 -0800
-+++ gcc-4.5+svnr155514/libgfortran/configure 2009-12-30 08:12:40.889091657 -0800
-@@ -11655,7 +11655,7 @@ CC="$lt_save_CC"
-
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- ac_ext=${ac_fc_srcext-f}
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-Index: gcc-4.5+svnr155514/libgfortran/configure.ac
-===================================================================
---- gcc-4.5+svnr155514.orig/libgfortran/configure.ac 2009-12-29 22:02:01.000000000 -0800
-+++ gcc-4.5+svnr155514/libgfortran/configure.ac 2009-12-30 08:12:13.453094218 -0800
-@@ -187,7 +187,7 @@ AC_SUBST(enable_static)
-
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- AC_PROG_FC(gfortran)
-
- # extra LD Flags which are required for targets
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch
deleted file mode 100644
index d1df8b271..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Adds support for Freescale Power architecture e300c2 and e300c3 cores.
-http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
-
-Leon Woestenberg <leonw@mailcan.com>
-
----
- gcc/config.gcc | 2
- gcc/config/rs6000/e300c2c3.md | 189 ++++++++++++++++++++++++++++++++++++++++++
- gcc/config/rs6000/rs6000.c | 24 +++++
- gcc/config/rs6000/rs6000.h | 4
- gcc/config/rs6000/rs6000.md | 3
- 5 files changed, 220 insertions(+), 2 deletions(-)
-
-Index: gcc-4.3.1/gcc/config/rs6000/e300c2c3.md
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.1/gcc/config/rs6000/e300c2c3.md 2008-08-23 16:51:33.000000000 -0700
-@@ -0,0 +1,189 @@
-+;; Pipeline description for Motorola PowerPC e300c3 core.
-+;; Copyright (C) 2003 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.
-+
-+(define_automaton "ppce300c3_most,ppce300c3_long,ppce300c3_retire")
-+(define_cpu_unit "ppce300c3_decode_0,ppce300c3_decode_1" "ppce300c3_most")
-+
-+;; We don't simulate general issue queue (GIC). If we have SU insn
-+;; and then SU1 insn, they can not be issued on the same cycle
-+;; (although SU1 insn and then SU insn can be issued) because the SU
-+;; insn will go to SU1 from GIC0 entry. Fortunately, the first cycle
-+;; multipass insn scheduling will find the situation and issue the SU1
-+;; insn and then the SU insn.
-+(define_cpu_unit "ppce300c3_issue_0,ppce300c3_issue_1" "ppce300c3_most")
-+
-+;; We could describe completion buffers slots in combination with the
-+;; retirement units and the order of completion but the result
-+;; automaton would behave in the same way because we can not describe
-+;; real latency time with taking in order completion into account.
-+;; Actually we could define the real latency time by querying reserved
-+;; automaton units but the current scheduler uses latency time before
-+;; issuing insns and making any reservations.
-+;;
-+;; So our description is aimed to achieve a insn schedule in which the
-+;; insns would not wait in the completion buffer.
-+(define_cpu_unit "ppce300c3_retire_0,ppce300c3_retire_1" "ppce300c3_retire")
-+
-+;; Branch unit:
-+(define_cpu_unit "ppce300c3_bu" "ppce300c3_most")
-+
-+;; IU:
-+(define_cpu_unit "ppce300c3_iu0_stage0,ppce300c3_iu1_stage0" "ppce300c3_most")
-+
-+;; IU: This used to describe non-pipelined division.
-+(define_cpu_unit "ppce300c3_mu_div" "ppce300c3_long")
-+
-+;; SRU:
-+(define_cpu_unit "ppce300c3_sru_stage0" "ppce300c3_most")
-+
-+;; Here we simplified LSU unit description not describing the stages.
-+(define_cpu_unit "ppce300c3_lsu" "ppce300c3_most")
-+
-+;; FPU:
-+(define_cpu_unit "ppce300c3_fpu" "ppce300c3_most")
-+
-+;; The following units are used to make automata deterministic
-+(define_cpu_unit "present_ppce300c3_decode_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_issue_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_retire_0" "ppce300c3_retire")
-+(define_cpu_unit "present_ppce300c3_iu0_stage0" "ppce300c3_most")
-+
-+;; The following sets to make automata deterministic when option ndfa is used.
-+(presence_set "present_ppce300c3_decode_0" "ppce300c3_decode_0")
-+(presence_set "present_ppce300c3_issue_0" "ppce300c3_issue_0")
-+(presence_set "present_ppce300c3_retire_0" "ppce300c3_retire_0")
-+(presence_set "present_ppce300c3_iu0_stage0" "ppce300c3_iu0_stage0")
-+
-+;; Some useful abbreviations.
-+(define_reservation "ppce300c3_decode"
-+ "ppce300c3_decode_0|ppce300c3_decode_1+present_ppce300c3_decode_0")
-+(define_reservation "ppce300c3_issue"
-+ "ppce300c3_issue_0|ppce300c3_issue_1+present_ppce300c3_issue_0")
-+(define_reservation "ppce300c3_retire"
-+ "ppce300c3_retire_0|ppce300c3_retire_1+present_ppce300c3_retire_0")
-+(define_reservation "ppce300c3_iu_stage0"
-+ "ppce300c3_iu0_stage0|ppce300c3_iu1_stage0+present_ppce300c3_iu0_stage0")
-+
-+;; Compares can be executed either one of the IU or SRU
-+(define_insn_reservation "ppce300c3_cmp" 1
-+ (and (eq_attr "type" "cmp,compare,delayed_compare,fast_compare")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+(ppce300c3_iu_stage0|ppce300c3_sru_stage0) \
-+ +ppce300c3_retire")
-+
-+;; Other one cycle IU insns
-+(define_insn_reservation "ppce300c3_iu" 1
-+ (and (eq_attr "type" "integer,insert_word")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Branch. Actually this latency time is not used by the scheduler.
-+(define_insn_reservation "ppce300c3_branch" 1
-+ (and (eq_attr "type" "jmpreg,branch")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_bu,ppce300c3_retire")
-+
-+;; Multiply is non-pipelined but can be executed in any IU
-+(define_insn_reservation "ppce300c3_multiply" 2
-+ (and (eq_attr "type" "imul,imul2,imul3,imul_compare")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0, \
-+ ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Divide. We use the average latency time here. We omit reserving a
-+;; retire unit because of the result automata will be huge.
-+(define_insn_reservation "ppce300c3_divide" 20
-+ (and (eq_attr "type" "idiv")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_mu_div,\
-+ ppce300c3_mu_div*19")
-+
-+;; CR logical
-+(define_insn_reservation "ppce300c3_cr_logical" 1
-+ (and (eq_attr "type" "cr_logical,delayed_cr")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mfcr
-+(define_insn_reservation "ppce300c3_mfcr" 1
-+ (and (eq_attr "type" "mfcr")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtcrf
-+(define_insn_reservation "ppce300c3_mtcrf" 1
-+ (and (eq_attr "type" "mtcr")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtjmpr
-+(define_insn_reservation "ppce300c3_mtjmpr" 1
-+ (and (eq_attr "type" "mtjmpr,mfjmpr")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Float point instructions
-+(define_insn_reservation "ppce300c3_fpcompare" 3
-+ (and (eq_attr "type" "fpcompare")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fp" 3
-+ (and (eq_attr "type" "fp")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_dmul" 4
-+ (and (eq_attr "type" "dmul")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+; Divides are not pipelined
-+(define_insn_reservation "ppce300c3_sdiv" 18
-+ (and (eq_attr "type" "sdiv")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*17")
-+
-+(define_insn_reservation "ppce300c3_ddiv" 33
-+ (and (eq_attr "type" "ddiv")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*32")
-+
-+;; Loads
-+(define_insn_reservation "ppce300c3_load" 2
-+ (and (eq_attr "type" "load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpload" 2
-+ (and (eq_attr "type" "fpload,fpload_ux,fpload_u")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+;; Stores.
-+(define_insn_reservation "ppce300c3_store" 2
-+ (and (eq_attr "type" "store,store_ux,store_u")
-+ (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpstore" 2
-+ (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u")
-+ (eq_attr "cpu" "ppce300c3"))
-+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.c
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.c 2008-08-23 16:49:39.000000000 -0700
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.c 2008-08-23 16:54:25.000000000 -0700
-@@ -669,6 +669,21 @@ struct processor_costs ppc8540_cost = {
- 1, /* prefetch streams /*/
- };
-
-+/* Instruction costs on E300C2 and E300C3 cores. */
-+static const
-+struct processor_costs ppce300c2c3_cost = {
-+ COSTS_N_INSNS (4), /* mulsi */
-+ COSTS_N_INSNS (4), /* mulsi_const */
-+ COSTS_N_INSNS (4), /* mulsi_const9 */
-+ COSTS_N_INSNS (4), /* muldi */
-+ COSTS_N_INSNS (19), /* divsi */
-+ COSTS_N_INSNS (19), /* divdi */
-+ COSTS_N_INSNS (3), /* fp */
-+ COSTS_N_INSNS (4), /* dmul */
-+ COSTS_N_INSNS (18), /* sdiv */
-+ COSTS_N_INSNS (33), /* ddiv */
-+};
-+
- /* Instruction costs on POWER4 and POWER5 processors. */
- static const
- struct processor_costs power4_cost = {
-@@ -1420,6 +1435,8 @@ rs6000_override_options (const char *def
- {"8540", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
- /* 8548 has a dummy entry for now. */
- {"8548", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
-+ {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
-+ {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK},
- {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
- {"970", PROCESSOR_POWER4,
- POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
-@@ -1845,6 +1862,11 @@ rs6000_override_options (const char *def
- rs6000_cost = &ppc8540_cost;
- break;
-
-+ case PROCESSOR_PPCE300C2:
-+ case PROCESSOR_PPCE300C3:
-+ rs6000_cost = &ppce300c2c3_cost;
-+ break;
-+
- case PROCESSOR_POWER4:
- case PROCESSOR_POWER5:
- rs6000_cost = &power4_cost;
-@@ -18606,6 +18628,8 @@ rs6000_issue_rate (void)
- case CPU_PPC7400:
- case CPU_PPC8540:
- case CPU_CELL:
-+ case CPU_PPCE300C2:
-+ case CPU_PPCE300C3:
- return 2;
- case CPU_RIOS2:
- case CPU_PPC604:
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.h
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.h 2008-01-26 09:18:35.000000000 -0800
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.h 2008-08-23 16:55:30.000000000 -0700
-@@ -117,6 +117,8 @@
- %{mcpu=G5: -mpower4 -maltivec} \
- %{mcpu=8540: -me500} \
- %{mcpu=8548: -me500} \
-+%{mcpu=e300c2: -mppc} \
-+%{mcpu=e300c3: -mppc -mpmr} \
- %{maltivec: -maltivec} \
- -many"
-
-@@ -262,6 +264,8 @@ enum processor_type
- PROCESSOR_PPC7400,
- PROCESSOR_PPC7450,
- PROCESSOR_PPC8540,
-+ PROCESSOR_PPCE300C2,
-+ PROCESSOR_PPCE300C3,
- PROCESSOR_POWER4,
- PROCESSOR_POWER5,
- PROCESSOR_POWER6,
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.md
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.md 2008-02-13 16:14:45.000000000 -0800
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.md 2008-08-23 16:57:29.000000000 -0700
-@@ -133,7 +133,7 @@
- ;; Processor type -- this attribute must exactly match the processor_type
- ;; enumeration in rs6000.h.
-
--(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell"
-+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell,ppce300c2,ppce300c3"
- (const (symbol_ref "rs6000_cpu_attr")))
-
-
-@@ -166,6 +166,7 @@
- (include "7xx.md")
- (include "7450.md")
- (include "8540.md")
-+(include "e300c2c3.md")
- (include "power4.md")
- (include "power5.md")
- (include "power6.md")
-Index: gcc-4.3.1/gcc/config.gcc
-===================================================================
---- gcc-4.3.1.orig/gcc/config.gcc 2008-08-23 16:49:43.000000000 -0700
-+++ gcc-4.3.1/gcc/config.gcc 2008-08-23 17:03:55.000000000 -0700
-@@ -3144,7 +3144,7 @@ case "${target}" in
- | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
- | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
- | 601 | 602 | 603 | 603e | ec603e | 604 \
-- | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-+ | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
- | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
- # OK
- ;;
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
deleted file mode 100644
index f33e6c1ea..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,31 +0,0 @@
----
- configure | 2 +-
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.3.1/configure.ac
-===================================================================
---- gcc-4.3.1.orig/configure.ac 2008-07-21 12:29:18.000000000 -0700
-+++ gcc-4.3.1/configure.ac 2008-07-21 12:29:35.000000000 -0700
-@@ -2352,7 +2352,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
-
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
- *" newlib "*)
- case " $target_configargs " in
-Index: gcc-4.3.1/configure
-===================================================================
---- gcc-4.3.1.orig/configure 2008-07-21 12:29:48.000000000 -0700
-+++ gcc-4.3.1/configure 2008-07-21 12:29:59.000000000 -0700
-@@ -5841,7 +5841,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
-
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
- *" newlib "*)
- case " $target_configargs " in
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2 b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2
deleted file mode 100644
index d37a2c032..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch
deleted file mode 100644
index d5a31d19d..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Date: Mon, 22 Nov 2010 13:28:54 +0000
-From: Julian Brown <julian at codesourcery dot com>
-To: gcc-patches at gcc dot gnu dot org
-Cc: DJ Delorie <dj at redhat dot com>
-Subject: [PATCH] Volatile bitfields vs. inline asm memory constraints
-Message-ID: <20101122132854.0aca431a@rex.config>
-Mime-Version: 1.0
-Content-Type: multipart/mixed; boundary="MP_/ONpW806RnQ1ziaYj7_Y5E27"
-X-IsSubscribed: yes
-Mailing-List: contact gcc-patches-help at gcc dot gnu dot org; run by ezmlm
-Precedence: bulk
-List-Id: <gcc-patches.gcc.gnu.org>
-List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
-List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
-List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
-Sender: gcc-patches-owner at gcc dot gnu dot org
-Delivered-To: mailing list gcc-patches at gcc dot gnu dot org
-
-
-
-Hi,
-
-This patch fixes the issue in the (Launchpad, not GCC) bug tracker:
-
-https://bugs.launchpad.net/gcc-linaro/+bug/675347
-
-The problem was introduced by the patch from DJ to honour volatile
-bitfield types:
-
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg01167.html
-
-but not exposed (on ARM) until the option was made the default (on the
-Linaro branch) -- it's not yet the default on mainline.
-
-The issue is as follows: after DJ's patch and with
--fstrict-volatile-bitfields, in expr.c:expand_expr_real_1, the if
-condition with the comment "In cases where an aligned union has an
-unaligned object as a field, we might be extracting a BLKmode value
-from an integer-mode (e.g., SImode) object [...]" triggers for a normal
-(non-bitfield) volatile field of a struct/class.
-
-But, this appears to be over-eager: in the particular case mentioned
-above, when expanding a "volatile int" struct field used as a memory
-constraint for an inline asm, we end up with something which is no
-longer addressable (I think because of the actions of
-extract_bit_field). So, compilation aborts.
-
-My proposed fix is to restrict the conditional by only making it execute
-for -fstrict-volatile-bitfields only for non-naturally-aligned accesses:
-this appears to work (fixes test in question, and no regressions for
-cross to ARM Linux, gcc/g++/libstdc++, with -fstrict-volatile-bitfields
-turned on), but I don't know if there will be unintended consequences.
-DJ, does it look sane to you?
-
-Incidentally the constraints in the inline asm in the Launchpad
-testcase might be slightly dubious (attempting to force (mem (reg)) by
-using both "+m" (var) and "r" (&var) constraints), but replacing
-them with e.g.:
-
- asm volatile("0:\n"
- "ldrex %[newValue], %[_q_value]\n"
- "sub %[newValue], %[newValue], #1\n"
- "strex %[result], %[newValue], %[_q_value]\n"
- "teq %[result], #0\n"
- "bne 0b\n"
- : [newValue] "=&r" (newValue),
- [result] "=&r" (result)
- : [_q_value] "Q" (_q_value)
- : "cc", "memory");
-
-still leads to a warning (not an error) with trunk and
--fstrict-volatile-bitfields:
-
-atomic-changed.cc:24:35: warning: use of memory input without lvalue in
-asm operand 2 is deprecated [enabled by default]
-
-The warning goes away with the attached patch. So, I don't think the
-problem is purely that the original inline asm is invalid.
-
-OK to apply, or any comments?
-
-Julian
-
-ChangeLog
-
- gcc/
- * expr.c (expand_expr_real_1): Only use BLKmode for volatile
- accesses which are not naturally aligned.
-
-Index: gcc-4_5-branch/gcc/expr.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/expr.c 2010-12-23 00:42:11.690101002 -0800
-+++ gcc-4_5-branch/gcc/expr.c 2010-12-24 15:07:39.400101000 -0800
-@@ -9029,7 +9029,8 @@
- && modifier != EXPAND_INITIALIZER)
- /* If the field is volatile, we always want an aligned
- access. */
-- || (volatilep && flag_strict_volatile_bitfields > 0)
-+ || (volatilep && flag_strict_volatile_bitfields > 0
-+ && (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
- /* If the field isn't aligned enough to fetch as a memref,
- fetch it as a bit field. */
- || (mode1 != BLKmode
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch
deleted file mode 100644
index 5d1a033a9..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-The LINK_SPEC for linux gets overwritten by linux-eabi.h which
-means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
-the option is not passed to linker when chosing march=armv4
-This patch redefines this in linux-eabi.h and reinserts it
-for eabi defaulting toolchains.
-
-We might want to send it upstream
-
--Khem
-Index: gcc-4.5/gcc/config/arm/linux-eabi.h
-===================================================================
---- gcc-4.5.orig/gcc/config/arm/linux-eabi.h
-+++ gcc-4.5/gcc/config/arm/linux-eabi.h
-@@ -63,10 +63,14 @@
- #undef GLIBC_DYNAMIC_LINKER
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-
-+/* For armv4 we pass --fix-v4bx to linker to support EABI */
-+#undef TARGET_FIX_V4BX_SPEC
-+#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4:--fix-v4bx}"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
- use the GNU/Linux version, not the generic BPABI version. */
- #undef LINK_SPEC
--#define LINK_SPEC LINUX_TARGET_LINK_SPEC BE8_LINK_SPEC
-+#define LINK_SPEC LINUX_TARGET_LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC
-
- /* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
- do not use -lfloat. */
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch
deleted file mode 100644
index 51892855a..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Index: gcc-4.5/Makefile.def
-===================================================================
---- gcc-4.5.orig/Makefile.def
-+++ gcc-4.5/Makefile.def
-@@ -240,6 +240,7 @@ flags_to_pass = { flag= AWK ; };
- flags_to_pass = { flag= BISON ; };
- flags_to_pass = { flag= CC_FOR_BUILD ; };
- flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
-+flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
- flags_to_pass = { flag= CXX_FOR_BUILD ; };
- flags_to_pass = { flag= EXPECT ; };
- flags_to_pass = { flag= FLEX ; };
-Index: gcc-4.5/gcc/Makefile.in
-===================================================================
---- gcc-4.5.orig/gcc/Makefile.in
-+++ gcc-4.5/gcc/Makefile.in
-@@ -766,7 +766,7 @@ BUILD_LINKERFLAGS = $(BUILD_CFLAGS)
-
- # Native linker and preprocessor flags. For x-fragment overrides.
- BUILD_LDFLAGS=@BUILD_LDFLAGS@
--BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
-+BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
-
- # Actual name to use when installing a native compiler.
- GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
-Index: gcc-4.5/gcc/configure.ac
-===================================================================
---- gcc-4.5.orig/gcc/configure.ac
-+++ gcc-4.5/gcc/configure.ac
-@@ -1798,16 +1798,18 @@ AC_SUBST(inhibit_libc)
- # Also, we cannot run fixincludes.
-
- # These are the normal (build=host) settings:
--CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
--BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
--BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
--STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
-+CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
-+BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
-+BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
-+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)' AC_SUBST(BUILD_CPPFLAGS)
-+STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
-
- # And these apply if build != host, or we are generating coverage data
- if test x$build != x$host || test "x$coverage_flags" != x
- then
- BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
- BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
-+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
- fi
-
- # Expand extra_headers to include complete path.
-Index: gcc-4.5/Makefile.in
-===================================================================
---- gcc-4.5.orig/Makefile.in
-+++ gcc-4.5/Makefile.in
-@@ -333,6 +333,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
- AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
- CXX_FOR_BUILD = @CXX_FOR_BUILD@
- DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-@@ -662,6 +663,7 @@ BASE_FLAGS_TO_PASS = \
- "BISON=$(BISON)" \
- "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
- "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-+ "CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
- "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
- "EXPECT=$(EXPECT)" \
- "FLEX=$(FLEX)" \
-Index: gcc-4.5/gcc/configure
-===================================================================
---- gcc-4.5.orig/gcc/configure
-+++ gcc-4.5/gcc/configure
-@@ -707,6 +707,7 @@ SED
- LIBTOOL
- collect2
- STMP_FIXINC
-+BUILD_CPPFLAGS
- BUILD_LDFLAGS
- BUILD_CFLAGS
- CC_FOR_BUILD
-@@ -10982,6 +10983,7 @@ fi
- CC_FOR_BUILD='$(CC)'
- BUILD_CFLAGS='$(ALL_CFLAGS)'
- BUILD_LDFLAGS='$(LDFLAGS)'
-+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
- STMP_FIXINC=stmp-fixinc
-
- # And these apply if build != host, or we are generating coverage data
-@@ -10989,6 +10991,7 @@ if test x$build != x$host || test "x$cov
- then
- BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
- BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
-+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
- fi
-
- # Expand extra_headers to include complete path.
-@@ -17108,7 +17111,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17111 "configure"
-+#line 17114 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -17214,7 +17217,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17217 "configure"
-+#line 17220 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-Index: gcc-4.5/Makefile.tpl
-===================================================================
---- gcc-4.5.orig/Makefile.tpl
-+++ gcc-4.5/Makefile.tpl
-@@ -336,6 +336,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
- AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
- CXX_FOR_BUILD = @CXX_FOR_BUILD@
- DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-Index: gcc-4.5/configure
-===================================================================
---- gcc-4.5.orig/configure
-+++ gcc-4.5/configure
-@@ -651,6 +651,7 @@ GCJ_FOR_BUILD
- DLLTOOL_FOR_BUILD
- CXX_FOR_BUILD
- CXXFLAGS_FOR_BUILD
-+CPPFLAGS_FOR_BUILD
- CFLAGS_FOR_BUILD
- CC_FOR_BUILD
- AS_FOR_BUILD
-@@ -8036,6 +8037,7 @@ esac
- # our build compiler if desired.
- if test x"${build}" = x"${host}" ; then
- CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
- CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
- LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
- fi
-@@ -8101,6 +8103,7 @@ done
-
-
-
-+
-
-
-
-Index: gcc-4.5/configure.ac
-===================================================================
---- gcc-4.5.orig/configure.ac
-+++ gcc-4.5/configure.ac
-@@ -3089,6 +3089,7 @@ esac
- # our build compiler if desired.
- if test x"${build}" = x"${host}" ; then
- CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
- CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
- LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
- fi
-@@ -3155,6 +3156,7 @@ AC_SUBST(AR_FOR_BUILD)
- AC_SUBST(AS_FOR_BUILD)
- AC_SUBST(CC_FOR_BUILD)
- AC_SUBST(CFLAGS_FOR_BUILD)
-+AC_SUBST(CPPFLAGS_FOR_BUILD)
- AC_SUBST(CXXFLAGS_FOR_BUILD)
- AC_SUBST(CXX_FOR_BUILD)
- AC_SUBST(DLLTOOL_FOR_BUILD)
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch
deleted file mode 100644
index 84c5ef2eb..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch
+++ /dev/null
@@ -1,331 +0,0 @@
-#! /bin/sh -e
-
-# DP: Retry the build on an ice, save the calling options and preprocessed
-# DP: source when the ice is reproducible.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-2004-01-23 Jakub Jelinek <jakub@redhat.com>
-
- * system.h (ICE_EXIT_CODE): Define.
- * gcc.c (execute): Don't free first string early, but at the end
- of the function. Call retry_ice if compiler exited with
- ICE_EXIT_CODE.
- (retry_ice): New function.
- * diagnostic.c (diagnostic_count_diagnostic,
- diagnostic_action_after_output, error_recursion): Exit with
- ICE_EXIT_CODE instead of FATAL_EXIT_CODE.
-
---- gcc/diagnostic.c.orig 2007-09-30 10:48:13.000000000 +0000
-+++ gcc/diagnostic.c 2007-09-30 10:49:57.000000000 +0000
-@@ -244,7 +244,7 @@
- fnotice (stderr, "Please submit a full bug report,\n"
- "with preprocessed source if appropriate.\n"
- "See %s for instructions.\n", bug_report_url);
-- exit (ICE_EXIT_CODE);
-+ exit (FATAL_EXIT_CODE);
-
- case DK_FATAL:
- if (context->abort_on_error)
---- gcc/gcc.c.orig 2007-09-30 10:48:13.000000000 +0000
-+++ gcc/gcc.c 2007-09-30 10:48:39.000000000 +0000
-@@ -357,6 +357,9 @@
- #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
- static const char *convert_filename (const char *, int, int);
- #endif
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+static void retry_ice (const char *prog, const char **argv);
-+#endif
-
- static const char *getenv_spec_function (int, const char **);
- static const char *if_exists_spec_function (int, const char **);
-@@ -2999,7 +3002,7 @@
- }
- }
-
-- if (string != commands[i].prog)
-+ if (i && string != commands[i].prog)
- free (CONST_CAST (char *, string));
- }
-
-@@ -3056,6 +3059,16 @@
- else if (WIFEXITED (status)
- && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
- {
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+ /* For ICEs in cc1, cc1obj, cc1plus see if it is
-+ reproducible or not. */
-+ char *p;
-+ if (WEXITSTATUS (status) == ICE_EXIT_CODE
-+ && i == 0
-+ && (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-+ && ! strncmp (p + 1, "cc1", 3))
-+ retry_ice (commands[0].prog, commands[0].argv);
-+#endif
- if (WEXITSTATUS (status) > greatest_status)
- greatest_status = WEXITSTATUS (status);
- ret_code = -1;
-@@ -3076,6 +3089,9 @@
- }
- }
-
-+ if (commands[0].argv[0] != commands[0].prog)
-+ free ((PTR) commands[0].argv[0]);
-+
- return ret_code;
- }
- }
-@@ -6016,6 +6032,224 @@
- switches[switchnum].validated = 1;
- }
-
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+#define RETRY_ICE_ATTEMPTS 2
-+
-+static void
-+retry_ice (const char *prog, const char **argv)
-+{
-+ int nargs, out_arg = -1, quiet = 0, attempt;
-+ int pid, retries, sleep_interval;
-+ const char **new_argv;
-+ char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];
-+
-+ if (input_filename == NULL || ! strcmp (input_filename, "-"))
-+ return;
-+
-+ for (nargs = 0; argv[nargs] != NULL; ++nargs)
-+ /* Only retry compiler ICEs, not preprocessor ones. */
-+ if (! strcmp (argv[nargs], "-E"))
-+ return;
-+ else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')
-+ {
-+ if (out_arg == -1)
-+ out_arg = nargs;
-+ else
-+ return;
-+ }
-+ /* If the compiler is going to output any time information,
-+ it might vary between invocations. */
-+ else if (! strcmp (argv[nargs], "-quiet"))
-+ quiet = 1;
-+ else if (! strcmp (argv[nargs], "-ftime-report"))
-+ return;
-+
-+ if (out_arg == -1 || !quiet)
-+ return;
-+
-+ memset (temp_filenames, '\0', sizeof (temp_filenames));
-+ new_argv = alloca ((nargs + 3) * sizeof (const char *));
-+ memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));
-+ new_argv[nargs++] = "-frandom-seed=0";
-+ new_argv[nargs] = NULL;
-+ if (new_argv[out_arg][2] == '\0')
-+ new_argv[out_arg + 1] = "-";
-+ else
-+ new_argv[out_arg] = "-o-";
-+
-+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)
-+ {
-+ int fd = -1;
-+ int status;
-+
-+ temp_filenames[attempt * 2] = make_temp_file (".out");
-+ temp_filenames[attempt * 2 + 1] = make_temp_file (".err");
-+
-+ if (attempt == RETRY_ICE_ATTEMPTS)
-+ {
-+ int i;
-+ int fd1, fd2;
-+ struct stat st1, st2;
-+ size_t n, len;
-+ char *buf;
-+
-+ buf = xmalloc (8192);
-+
-+ for (i = 0; i < 2; ++i)
-+ {
-+ fd1 = open (temp_filenames[i], O_RDONLY);
-+ fd2 = open (temp_filenames[2 + i], O_RDONLY);
-+
-+ if (fd1 < 0 || fd2 < 0)
-+ {
-+ i = -1;
-+ close (fd1);
-+ close (fd2);
-+ break;
-+ }
-+
-+ if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)
-+ {
-+ i = -1;
-+ close (fd1);
-+ close (fd2);
-+ break;
-+ }
-+
-+ if (st1.st_size != st2.st_size)
-+ {
-+ close (fd1);
-+ close (fd2);
-+ break;
-+ }
-+
-+ len = 0;
-+ for (n = st1.st_size; n; n -= len)
-+ {
-+ len = n;
-+ if (len > 4096)
-+ len = 4096;
-+
-+ if (read (fd1, buf, len) != (int) len
-+ || read (fd2, buf + 4096, len) != (int) len)
-+ {
-+ i = -1;
-+ break;
-+ }
-+
-+ if (memcmp (buf, buf + 4096, len) != 0)
-+ break;
-+ }
-+
-+ close (fd1);
-+ close (fd2);
-+
-+ if (n)
-+ break;
-+ }
-+
-+ free (buf);
-+ if (i == -1)
-+ break;
-+
-+ if (i != 2)
-+ {
-+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+ break;
-+ }
-+
-+ fd = open (temp_filenames[attempt * 2], O_RDWR);
-+ if (fd < 0)
-+ break;
-+ write (fd, "//", 2);
-+ for (i = 0; i < nargs; i++)
-+ {
-+ write (fd, " ", 1);
-+ write (fd, new_argv[i], strlen (new_argv[i]));
-+ }
-+ write (fd, "\n", 1);
-+ new_argv[nargs] = "-E";
-+ new_argv[nargs + 1] = NULL;
-+ }
-+
-+ /* Fork a subprocess; wait and retry if it fails. */
-+ sleep_interval = 1;
-+ pid = -1;
-+ for (retries = 0; retries < 4; retries++)
-+ {
-+ pid = fork ();
-+ if (pid >= 0)
-+ break;
-+ sleep (sleep_interval);
-+ sleep_interval *= 2;
-+ }
-+
-+ if (pid < 0)
-+ break;
-+ else if (pid == 0)
-+ {
-+ if (attempt != RETRY_ICE_ATTEMPTS)
-+ fd = open (temp_filenames[attempt * 2], O_RDWR);
-+ if (fd < 0)
-+ exit (-1);
-+ if (fd != 1)
-+ {
-+ close (1);
-+ dup (fd);
-+ close (fd);
-+ }
-+
-+ fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);
-+ if (fd < 0)
-+ exit (-1);
-+ if (fd != 2)
-+ {
-+ close (2);
-+ dup (fd);
-+ close (fd);
-+ }
-+
-+ if (prog == new_argv[0])
-+ execvp (prog, (char *const *) new_argv);
-+ else
-+ execv (new_argv[0], (char *const *) new_argv);
-+ exit (-1);
-+ }
-+
-+ if (waitpid (pid, &status, 0) < 0)
-+ break;
-+
-+ if (attempt < RETRY_ICE_ATTEMPTS
-+ && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))
-+ {
-+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+ break;
-+ }
-+ else if (attempt == RETRY_ICE_ATTEMPTS)
-+ {
-+ close (fd);
-+ if (WIFEXITED (status)
-+ && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)
-+ {
-+ notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",
-+ temp_filenames[attempt * 2]);
-+ /* Make sure it is not deleted. */
-+ free (temp_filenames[attempt * 2]);
-+ temp_filenames[attempt * 2] = NULL;
-+ break;
-+ }
-+ }
-+ }
-+
-+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)
-+ if (temp_filenames[attempt])
-+ {
-+ unlink (temp_filenames[attempt]);
-+ free (temp_filenames[attempt]);
-+ }
-+}
-+#endif
-+
- /* Search for a file named NAME trying various prefixes including the
- user's -B prefix and some standard ones.
- Return the absolute file name found. If nothing is found, return NAME. */
---- gcc/Makefile.in.orig 2007-09-30 10:48:13.000000000 +0000
-+++ gcc/Makefile.in 2007-09-30 10:48:39.000000000 +0000
-@@ -192,6 +192,7 @@
- build/gengtype-lex.o-warn = -Wno-error
- # SYSCALLS.c misses prototypes
- SYSCALLS.c.X-warn = -Wno-strict-prototypes -Wno-error
-+build/gcc.o-warn = -Wno-error
-
- # All warnings have to be shut off in stage1 if the compiler used then
- # isn't gcc; configure determines that. WARN_CFLAGS will be either
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch
deleted file mode 100644
index 862b10213..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch. The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan. If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: gcc-4_5-branch/gcc/incpath.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/incpath.c
-+++ gcc-4_5-branch/gcc/incpath.c
-@@ -365,7 +365,9 @@ merge_include_chains (const char *sysroo
- {
- if ((!strncmp (p->name, "/usr/include", 12))
- || (!strncmp (p->name, "/usr/local/include", 18))
-- || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+ || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+ || (!strncmp (p->name, "/sw/include", 11))
-+ || (!strncmp (p->name, "/opt/include", 12)))
- warning (OPT_Wpoison_system_directories,
- "include location \"%s\" is unsafe for "
- "cross-compilation",
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch
deleted file mode 100644
index ba20e8b15..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-gcc: add poison parameters detection
-
-Add the logic that, if not configured with "--enable-target-optspace",
-gcc will meet error when build target app with "-Os" option.
-This could avoid potential binary crash.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Index: gcc-4_5-branch/gcc/config.in
-===================================================================
---- gcc-4_5-branch.orig/gcc/config.in
-+++ gcc-4_5-branch/gcc/config.in
-@@ -138,6 +138,12 @@
- #endif
-
-
-+/* Define to enable target optspace support. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_TARGET_OPTSPACE
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
- optimizer and back end) to be checked for dynamic type safety at runtime.
- This is quite expensive. */
-Index: gcc-4_5-branch/gcc/configure
-===================================================================
---- gcc-4_5-branch.orig/gcc/configure
-+++ gcc-4_5-branch/gcc/configure
-@@ -915,6 +915,7 @@ enable_version_specific_runtime_libs
- with_slibdir
- enable_poison_system_directories
- enable_plugin
-+enable_target_optspace
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -25658,6 +25659,13 @@ $as_echo "#define ENABLE_PLUGIN 1" >>con
-
- fi
-
-+if test x"$enable_target_optspace" != x; then :
-+
-+$as_echo "#define ENABLE_TARGET_OPTSPACE 1" >>confdefs.h
-+
-+fi
-+
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-Index: gcc-4_5-branch/gcc/configure.ac
-===================================================================
---- gcc-4_5-branch.orig/gcc/configure.ac
-+++ gcc-4_5-branch/gcc/configure.ac
-@@ -4659,6 +4659,11 @@ if test x"$enable_plugin" = x"yes"; then
- AC_DEFINE(ENABLE_PLUGIN, 1, [Define to enable plugin support.])
- fi
-
-+AC_SUBST(enable_target_optspace)
-+if test x"$enable_target_optspace" != x; then
-+ AC_DEFINE(ENABLE_TARGET_OPTSPACE, 1, [Define to enable target optspace support.])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-Index: gcc-4_5-branch/gcc/opts.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/opts.c
-+++ gcc-4_5-branch/gcc/opts.c
-@@ -953,6 +953,11 @@ decode_options (unsigned int argc, const
- else
- set_param_value ("min-crossjump-insns", initial_min_crossjump_insns);
-
-+#ifndef ENABLE_TARGET_OPTSPACE
-+ if (optimize_size == 1)
-+ error ("Do not use -Os option if --enable-target-optspace is not set.");
-+#endif
-+
- if (first_time_p)
- {
- /* Initialize whether `char' is signed. */
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch
deleted file mode 100644
index 04043ff0b..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch
+++ /dev/null
@@ -1,201 +0,0 @@
- gcc/
- 2008-07-02 Joseph Myers <joseph@codesourcery.com>
- * c-incpath.c: Include toplev.h.
- (merge_include_chains): Use warning instead of cpp_error for
- system directory poisoning diagnostic.
- * Makefile.in (c-incpath.o): Depend on toplev.h.
- * gcc.c (LINK_COMMAND_SPEC): Pass
- --error-poison-system-directories if
- -Werror=poison-system-directories.
-
- 2007-06-13 Joseph Myers <joseph@codesourcery.com>
- * common.opt (--Wno-poison-system-directories): New.
- * doc/invoke.texi (-Wno-poison-system-directories): Document.
- * c-incpath.c: Include flags.h.
- (merge_include_chains): Check flag_poison_system_directories.
- * gcc.c (LINK_COMMAND_SPEC): Pass --no-poison-system-directories
- to linker if -Wno-poison-system-directories.
- * Makefile.in (c-incpath.o): Depend on $(FLAGS_H).
-
- 2007-03-20 Daniel Jacobowitz <dan@codesourcery.com>
- Joseph Myers <joseph@codesourcery.com>
- * configure.ac (--enable-poison-system-directories): New option.
- * configure, config.in: Regenerate.
- * c-incpath.c (merge_include_chains): If
- ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of
- /usr/include, /usr/local/include or /usr/X11R6/include.
-
-Index: gcc-4.5.0/gcc/common.opt
-===================================================================
---- gcc-4.5.0.orig/gcc/common.opt 2010-03-17 20:01:09.000000000 -0700
-+++ gcc-4.5.0/gcc/common.opt 2010-06-25 11:35:39.965383734 -0700
-@@ -152,6 +152,10 @@
- Common Var(warn_padded) Warning
- Warn when padding is required to align structure members
-
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one local variable shadows another
-Index: gcc-4.5.0/gcc/config.in
-===================================================================
---- gcc-4.5.0.orig/gcc/config.in 2010-04-14 02:30:07.000000000 -0700
-+++ gcc-4.5.0/gcc/config.in 2010-06-25 11:35:39.969383588 -0700
-@@ -132,6 +132,12 @@
- #endif
-
-
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
- optimizer and back end) to be checked for dynamic type safety at runtime.
- This is quite expensive. */
-Index: gcc-4.5.0/gcc/configure.ac
-===================================================================
---- gcc-4.5.0.orig/gcc/configure.ac 2010-06-25 11:34:01.433382161 -0700
-+++ gcc-4.5.0/gcc/configure.ac 2010-06-25 11:35:39.969383588 -0700
-@@ -4276,6 +4276,16 @@
- fi)
- AC_SUBST(slibdir)
-
-+AC_ARG_ENABLE([poison-system-directories],
-+ AS_HELP_STRING([--enable-poison-system-directories],
-+ [warn for use of native system header directories]),,
-+ [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+ [1],
-+ [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-Index: gcc-4.5.0/gcc/doc/invoke.texi
-===================================================================
---- gcc-4.5.0.orig/gcc/doc/invoke.texi 2010-04-06 07:02:22.000000000 -0700
-+++ gcc-4.5.0/gcc/doc/invoke.texi 2010-06-25 11:35:39.992666345 -0700
-@@ -252,6 +252,7 @@
- -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol
- -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol
- -Wpointer-arith -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wredundant-decls @gol
- -Wreturn-type -Wsequence-point -Wshadow @gol
- -Wsign-compare -Wsign-conversion -Wstack-protector @gol
-@@ -3603,6 +3604,14 @@
- option will @emph{not} warn about unknown pragmas in system
- headers---for that, @option{-Wunknown-pragmas} must also be used.
-
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling. This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-Index: gcc-4.5.0/gcc/gcc.c
-===================================================================
---- gcc-4.5.0.orig/gcc/gcc.c 2010-02-11 04:23:08.000000000 -0800
-+++ gcc-4.5.0/gcc/gcc.c 2010-06-25 11:35:40.009381858 -0700
-@@ -792,6 +792,8 @@
- %{flto} %{fwhopr} %l " LINK_PIE_SPEC \
- "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
- %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
-+ %{Wno-poison-system-directories:--no-poison-system-directories}\
-+ %{Werror=poison-system-directories:--error-poison-system-directories}\
- %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
- %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)} %(mflib)\
- %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
-Index: gcc-4.5.0/gcc/incpath.c
-===================================================================
---- gcc-4.5.0.orig/gcc/incpath.c 2009-11-25 02:55:54.000000000 -0800
-+++ gcc-4.5.0/gcc/incpath.c 2010-06-25 11:35:40.017209818 -0700
-@@ -353,6 +353,24 @@
- }
- fprintf (stderr, _("End of search list.\n"));
- }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+ if (flag_poison_system_directories)
-+ {
-+ struct cpp_dir *p;
-+
-+ for (p = heads[QUOTE]; p; p = p->next)
-+ {
-+ if ((!strncmp (p->name, "/usr/include", 12))
-+ || (!strncmp (p->name, "/usr/local/include", 18))
-+ || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+ warning (OPT_Wpoison_system_directories,
-+ "include location \"%s\" is unsafe for "
-+ "cross-compilation",
-+ p->name);
-+ }
-+ }
-+#endif
- }
-
- /* Use given -I paths for #include "..." but not #include <...>, and
-diff -ur gcc-4.5.0.orig/gcc/Makefile.in gcc-4.5.0/gcc/Makefile.in
---- gcc-4.5.0.orig/gcc/Makefile.in 2010-09-29 17:13:49.164088845 -0500
-+++ gcc-4.5.0/gcc/Makefile.in 2010-09-29 18:48:19.300178501 -0500
-@@ -1965,7 +1965,7 @@
-
- incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
- intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
-- $(MACHMODE_H)
-+ $(MACHMODE_H) $(FLAGS_H) toplev.h
-
- c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
- $(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) $(FUNCTION_H) output.h \
-diff -ur gcc-4.5.0.orig/gcc/configure gcc-4.5.0/gcc/configure
---- gcc-4.5.0.orig/gcc/configure 2010-09-29 14:58:31.702054881 -0500
-+++ gcc-4.5.0/gcc/configure 2010-09-29 18:46:31.486068500 -0500
-@@ -913,6 +913,7 @@
- enable_maintainer_mode
- enable_version_specific_runtime_libs
- with_slibdir
-+enable_poison_system_directories
- enable_plugin
- enable_target_optspace
- '
-@@ -1621,6 +1622,8 @@
- --enable-version-specific-runtime-libs
- specify that runtime libraries should be
- installed in a compiler-specific directory
-+ --enable-poison-system-directories
-+ warn for use of native system header directories
- --enable-plugin enable plugin support
-
- Optional Packages:
-@@ -25339,6 +25377,19 @@
-
-
-
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+ enableval=$enable_poison_system_directories;
-+else
-+ enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
-
-
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ppc-config-fix.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ppc-config-fix.patch
deleted file mode 100644
index 6ae75a012..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-ppc-config-fix.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-commit de784bee66a1ec1d0dad00d9eedbe9b1667dd883
-Author: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon Dec 20 15:29:31 2010 +0000
-
- * config/rs6000/freebsd.h (SVR4_ASM_SPEC): Don't define.
- (DBX_REGISTER_NUMBER): Define.
- * config/rs6000/lynx.h (DBX_REGISTER_NUMBER): Define.
- * config/rs6000/netbsd.h (DBX_REGISTER_NUMBER): Define.
- * config/rs6000/sysv4.h (SIZE_TYPE): Define.
- (ASM_SPEC): Define without using SVR4_ASM_SPEC.
- (DBX_REGISTER_NUMBER): Undefine.
- * config.gcc (powerpc-*-eabispe*, powerpc-*-eabisimaltivec*,
- powerpc-*-eabisim*, powerpc-*-elf*, powerpc-*-eabialtivec*,
- powerpc-xilinx-eabi*, powerpc-*-eabi*, powerpc-*-rtems*,
- powerpc-*-linux* | powerpc64-*-linux*, powerpc64-*-gnu*,
- powerpc-*-gnu-gnualtivec*, powerpc-*-gnu*,
- powerpc-wrs-vxworks|powerpc-wrs-vxworksae, powerpcle-*-elf*,
- powerpcle-*-eabisim*, powerpcle-*-eabi*): Don't use svr4.h.
-
-
- git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168085 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Index: gcc-4_5-branch/gcc/config.gcc
-===================================================================
---- gcc-4_5-branch.orig/gcc/config.gcc 2011-09-17 11:11:28.000000000 -0700
-+++ gcc-4_5-branch/gcc/config.gcc 2011-09-17 11:16:32.543298716 -0700
-@@ -1989,48 +1989,48 @@ powerpc-*-netbsd*)
- extra_options="${extra_options} rs6000/sysv4.opt"
- ;;
- powerpc-*-eabispe*)
-- tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-spe rs6000/t-ppccomm"
- use_gcc_stdint=wrap
- ;;
- powerpc-*-eabisimaltivec*)
-- tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
- use_gcc_stdint=wrap
- ;;
- powerpc-*-eabisim*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- use_gcc_stdint=wrap
- ;;
- powerpc-*-elf*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- ;;
- powerpc-*-eabialtivec*)
-- tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
- use_gcc_stdint=wrap
- ;;
- powerpc-xilinx-eabi*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h rs6000/xilinx.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h rs6000/xilinx.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm rs6000/t-xilinx"
- use_gcc_stdint=wrap
- ;;
- powerpc-*-eabi*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- use_gcc_stdint=wrap
- ;;
- powerpc-*-rtems*)
-- tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
- ;;
-@@ -2079,12 +2079,12 @@ powerpc-*-linux* | powerpc64-*-linux*)
- fi
- ;;
- powerpc64-*-gnu*)
-- tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/default64.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
-+ tm_file="${tm_file} elfos.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/default64.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
- extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
- tmake_file="t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu"
- ;;
- powerpc-*-gnu-gnualtivec*)
-- tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h glibc-stdint.h"
-+ tm_file="${cpu_type}/${cpu_type}.h elfos.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h glibc-stdint.h"
- extra_options="${extra_options} rs6000/sysv4.opt"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
- if test x$enable_threads = xyes; then
-@@ -2092,7 +2092,7 @@ powerpc-*-gnu-gnualtivec*)
- fi
- ;;
- powerpc-*-gnu*)
-- tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h glibc-stdint.h"
-+ tm_file="${cpu_type}/${cpu_type}.h elfos.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h glibc-stdint.h"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
- extra_options="${extra_options} rs6000/sysv4.opt"
- if test x$enable_threads = xyes; then
-@@ -2100,7 +2100,7 @@ powerpc-*-gnu*)
- fi
- ;;
- powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
-- tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-+ tm_file="${tm_file} elfos.h freebsd-spec.h rs6000/sysv4.h"
- tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppccomm rs6000/t-vxworks"
- extra_options="${extra_options} rs6000/sysv4.opt"
- extra_headers=ppc-asm.h
-@@ -2126,18 +2126,18 @@ powerpc-*-lynxos*)
- gas=yes
- ;;
- powerpcle-*-elf*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_options="${extra_options} rs6000/sysv4.opt"
- ;;
- powerpcle-*-eabisim*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_options="${extra_options} rs6000/sysv4.opt"
- use_gcc_stdint=wrap
- ;;
- powerpcle-*-eabi*)
-- tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
-+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
- tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_options="${extra_options} rs6000/sysv4.opt"
- use_gcc_stdint=wrap
-Index: gcc-4_5-branch/gcc/config/rs6000/freebsd.h
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/rs6000/freebsd.h 2011-06-16 17:58:58.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/rs6000/freebsd.h 2011-09-17 11:13:13.623298761 -0700
-@@ -69,6 +69,4 @@
- /* Override rs6000.h definition. */
- #undef ASM_APP_OFF
- #define ASM_APP_OFF "#NO_APP\n"
--/* Define SVR4_ASM_SPEC, we use GAS by default. See svr4.h for details. */
--#define SVR4_ASM_SPEC \
-- "%{v:-V} %{Wa,*:%*}"
-+#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
-Index: gcc-4_5-branch/gcc/config/rs6000/lynx.h
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/rs6000/lynx.h 2011-06-16 17:58:58.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/rs6000/lynx.h 2011-09-17 11:13:13.623298761 -0700
-@@ -1,5 +1,5 @@
- /* Definitions for Rs6000 running LynxOS.
-- Copyright (C) 1995, 1996, 2000, 2002, 2003, 2004, 2005, 2007
-+ Copyright (C) 1995, 1996, 2000, 2002, 2003, 2004, 2005, 2007, 2010
- Free Software Foundation, Inc.
- Contributed by David Henkel-Wallace, Cygnus Support (gumby@cygnus.com)
- Rewritten by Adam Nemet, LynuxWorks Inc.
-@@ -105,6 +105,8 @@
- #undef HAVE_AS_TLS
- #define HAVE_AS_TLS 0
-
-+#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
-+
- #ifdef CRT_BEGIN
- /* This function is part of crtbegin*.o which is at the beginning of
- the link and is called from .fini which is usually toward the end
-Index: gcc-4_5-branch/gcc/config/rs6000/netbsd.h
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/rs6000/netbsd.h 2011-06-16 17:58:58.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/rs6000/netbsd.h 2011-09-17 11:13:13.623298761 -0700
-@@ -1,6 +1,6 @@
- /* Definitions of target machine for GNU compiler,
- for PowerPC NetBSD systems.
-- Copyright 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
-+ Copyright 2002, 2003, 2007, 2008, 2010 Free Software Foundation, Inc.
- Contributed by Wasabi Systems, Inc.
-
- This file is part of GCC.
-@@ -89,3 +89,5 @@
-
- #undef TARGET_VERSION
- #define TARGET_VERSION fprintf (stderr, " (NetBSD/powerpc ELF)");
-+
-+#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
-Index: gcc-4_5-branch/gcc/config/rs6000/sysv4.h
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/rs6000/sysv4.h 2011-09-17 11:11:29.000000000 -0700
-+++ gcc-4_5-branch/gcc/config/rs6000/sysv4.h 2011-09-17 11:13:13.623298761 -0700
-@@ -293,6 +293,10 @@ do { \
- #define RESTORE_FP_PREFIX "_restfpr_"
- #define RESTORE_FP_SUFFIX ""
-
-+/* Type used for size_t, as a string used in a declaration. */
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
- /* Type used for ptrdiff_t, as a string used in a declaration. */
- #define PTRDIFF_TYPE "int"
-
-@@ -588,9 +592,8 @@ extern int fixuplabelno;
- /* Override svr4.h definition. */
- #undef ASM_SPEC
- #define ASM_SPEC "%(asm_cpu) \
--%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}}" \
--SVR4_ASM_SPEC \
--"%{mrelocatable} %{mrelocatable-lib} %{fpic|fpie|fPIC|fPIE:-K PIC} \
-+%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}} \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic|fpie|fPIC|fPIE:-K PIC} \
- %{memb|msdata=eabi: -memb} \
- %{mlittle|mlittle-endian:-mlittle; \
- mbig|mbig-endian :-mbig; \
-@@ -1120,3 +1123,5 @@ ncrtn.o%s"
-
- /* This target uses the sysv4.opt file. */
- #define TARGET_USES_SYSV4_OPT 1
-+
-+#undef DBX_REGISTER_NUMBER
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch
deleted file mode 100644
index 61c883e1f..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-backport http://gcc.gnu.org/viewcvs?view=revision&revision=162404
-from trunk
-
-Which fixes http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43698
-
-2010-07-22 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-
- PR target/43698
- * config/arm/arm.md: Split arm_rev into *arm_rev
- and *thumb1_rev. Set *arm_rev to be predicable.
-
-2010-07-22 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-
- PR target/43698
- * gcc.target/arm/pr43698.c: New test.
-
-
-/scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
- -d, --date=STRING display time described by STRING, not `now'
- -f, --file=DATEFILE like --date once for each line of DATEFILE
- -R, --rfc-822 output RFC-822 compliant date string
- -u, --utc, --universal print or set Coordinated Universal Time
- --help display this help and exit
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /bin/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /bin/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /bin/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date
-date is /bin/date
-date
-Khem
-Index: gcc-4.5/gcc/config/arm/arm.md
-===================================================================
---- gcc-4.5.orig/gcc/config/arm/arm.md 2010-07-20 20:31:25.000000000 -0700
-+++ gcc-4.5/gcc/config/arm/arm.md 2010-07-22 14:55:54.303169081 -0700
-@@ -11197,15 +11197,21 @@
- (set_attr "length" "4")]
- )
-
--(define_insn "arm_rev"
-+(define_insn "*arm_rev"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
- (bswap:SI (match_operand:SI 1 "s_register_operand" "r")))]
-- "TARGET_EITHER && arm_arch6"
-- "rev\t%0, %1"
-- [(set (attr "length")
-- (if_then_else (eq_attr "is_thumb" "yes")
-- (const_int 2)
-- (const_int 4)))]
-+ "TARGET_32BIT && arm_arch6"
-+ "rev%?\t%0, %1"
-+ [(set_attr "predicable" "yes")
-+ (set_attr "length" "4")]
-+)
-+
-+(define_insn "*thumb1_rev"
-+ [(set (match_operand:SI 0 "s_register_operand" "=l")
-+ (bswap:SI (match_operand:SI 1 "s_register_operand" "l")))]
-+ "TARGET_THUMB1 && arm_arch6"
-+ "rev\t%0, %1"
-+ [(set_attr "length" "2")]
- )
-
- (define_expand "arm_legacy_rev"
-Index: gcc-4.5/gcc/testsuite/gcc.target/arm/pr43698.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.5/gcc/testsuite/gcc.target/arm/pr43698.c 2010-07-22 14:56:35.406670213 -0700
-@@ -0,0 +1,39 @@
-+/* { dg-do run } */
-+/* { dg-options "-Os -march=armv7-a" } */
-+#include <stdint.h>
-+#include <stdlib.h>
-+
-+
-+char do_reverse_endian = 0;
-+
-+# define bswap_32(x) \
-+ ((((x) & 0xff000000) >> 24) | \
-+ (((x) & 0x00ff0000) >> 8) | \
-+ (((x) & 0x0000ff00) << 8) | \
-+ (((x) & 0x000000ff) << 24))
-+
-+#define EGET(X) \
-+ (__extension__ ({ \
-+ uint64_t __res; \
-+ if (!do_reverse_endian) { __res = (X); \
-+ } else if (sizeof(X) == 4) { __res = bswap_32((X)); \
-+ } \
-+ __res; \
-+ }))
-+
-+void __attribute__((noinline)) X(char **phdr, char **data, int *phoff)
-+{
-+ *phdr = *data + EGET(*phoff);
-+}
-+
-+int main()
-+{
-+ char *phdr;
-+ char *data = (char *)0x40164000;
-+ int phoff = 0x34;
-+ X(&phdr, &data, &phoff);
-+ if (phdr != (char *)0x40164034)
-+ abort ();
-+ exit (0);
-+}
-+
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch
deleted file mode 100644
index cbe12303e..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Hi,
-
-The attached patch fixes Bugzilla 45847
-(http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45847). When compiling
-without -mvectorize-with-neon-quad and vectorizing scalar widening
-operations that widen words to double words, there are no corresponding
-vector types for DI scalar types. For this scenario, a call to
-get_vect_type_for_scalar_type() returns NULL and an absent NULL-check
-caused this segfault. The attached patch adds this NULL-check. Also,
-this is consistent with all the other places where a NULL-check follows
-a call to get_vect_type_for_scalar_type() in tree-vect-patterns.c.
-
-Regression tested with arm-linux-gnueabi. OK?
-
---
-Tejas Belagod
-ARM.
-
-gcc/
-
-2010-10-05 Tejas Belagod <tejas.belagod@arm.com>
-
- * tree-vect-patterns.c (vect_recog_widen_mult_pattern): Add NULL
- check for vectype_out returned by get_vectype_for_scalar_type().
-
-testsuite/
-
-2010-10-05 Tejas Belagod <tejas.belagod@arm.com>
-
- * gcc.dg/vect/pr45847.c: New test.
-
-Index: gcc-4.5/gcc/testsuite/gcc.dg/vect/pr45847.c
-===================================================================
---- /dev/null
-+++ gcc-4.5/gcc/testsuite/gcc.dg/vect/pr45847.c
-@@ -0,0 +1,15 @@
-+/* { dg-do compile } */
-+
-+
-+long long foo (long long *__restrict a, int *__restrict b, int *__restrict c )
-+{
-+ int i;
-+ long long sum=0;
-+ for (i=0;i<256;i++)
-+ sum += (long long)b[i] * c[i];
-+
-+ return sum;
-+}
-+
-+/* { dg-final { cleanup-tree-dump "vect" } } */
-+
-Index: gcc-4.5/gcc/tree-vect-patterns.c
-===================================================================
---- gcc-4.5.orig/gcc/tree-vect-patterns.c
-+++ gcc-4.5/gcc/tree-vect-patterns.c
-@@ -411,6 +411,7 @@ vect_recog_widen_mult_pattern (gimple la
- /* Check target support */
- vectype = get_vectype_for_scalar_type (half_type0);
- if (!vectype
-+ || !get_vectype_for_scalar_type (type)
- || !supportable_widening_operation (WIDEN_MULT_EXPR, last_stmt, vectype,
- &dummy, &dummy, &dummy_code,
- &dummy_code, &dummy_int, &dummy_vec))
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch
deleted file mode 100644
index 4f94fc9d6..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:30:53.993316002 -0700
-+++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:31:26.043316001 -0700
-@@ -41,12 +41,17 @@
-
- #include <clocale>
- #include <cstddef>
-+#include <features.h>
-+#include <ctype.h>
-
- #define _GLIBCXX_NUM_CATEGORIES 0
-
- _GLIBCXX_BEGIN_NAMESPACE(std)
--
-- typedef int* __c_locale;
-+#ifdef __UCLIBC__
-+ typedef __ctype_touplow_t* __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-
- // Convert numeric value of type double and long double to string and
- // return length of string. If vsnprintf is available use it, otherwise
-Index: gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-===================================================================
---- gcc-4.5.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:30:54.013316002 -0700
-+++ gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:31:26.053316001 -0700
-@@ -33,14 +33,21 @@
- */
-
- // Information as gleaned from /usr/include/ctype.h
--
-+
-+#include <features.h>
-+#include <ctype.h>
-+
- _GLIBCXX_BEGIN_NAMESPACE(std)
-
- /// @brief Base class for ctype.
- struct ctype_base
- {
- // Non-standard typedefs.
-- typedef const int* __to_type;
-+#ifdef __UCLIBC__
-+ typedef const __ctype_touplow_t* __to_type;
-+#else
-+ typedef const int* __to_type;
-+#endif
-
- // NB: Offsets into ctype<char>::_M_table force a particular size
- // on the mask type. Because of this, we don't use an enum.
-Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc
-===================================================================
---- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-28 12:12:42.000000000 -0700
-+++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-30 22:31:26.063316001 -0700
-@@ -256,5 +256,10 @@ _GLIBCXX_END_NAMESPACE
- #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
- #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
- extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
-+#ifdef __UCLIBC__
-+// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int*
-+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs);
-+#else
- _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
-+#endif
- #endif // _GLIBCXX_LONG_DOUBLE_COMPAT
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-with-linker-hash-style.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-with-linker-hash-style.patch
deleted file mode 100644
index ac4281ac2..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc-with-linker-hash-style.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-commit 3cb9bbfa927aa187048534f9069202c017a78e38
-Author: ppluzhnikov <ppluzhnikov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed May 11 18:28:14 2011 +0000
-
- 2011-05-11 Satoru Takabayashi <satorux@google.com>
- Paul Pluzhnikov <ppluzhnikov@google.com>
-
- * gcc/doc/install.texi (Configuration): Document
- --with-linker-hash-style.
- * gcc/gcc.c (init_spec): Handle LINKER_HASH_STYLE.
- * gcc/config.in: Add LINKER_HASH_STYLE.
- * gcc/configure.ac: Add --with-linker-hash-style.
- * gcc/configure: Regenerate.
-
-
-
- git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173668 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Index: gcc-4_5-branch/gcc/config.in
-===================================================================
---- gcc-4_5-branch.orig/gcc/config.in 2011-12-03 13:41:00.000000000 -0800
-+++ gcc-4_5-branch/gcc/config.in 2011-12-03 13:44:46.287530329 -0800
-@@ -113,6 +113,12 @@
- #endif
-
-
-+/* The linker hash style */
-+#ifndef USED_FOR_TARGET
-+#undef LINKER_HASH_STYLE
-+#endif
-+
-+
- /* Define to enable LTO support. */
- #ifndef USED_FOR_TARGET
- #undef ENABLE_LTO
-Index: gcc-4_5-branch/gcc/configure
-===================================================================
---- gcc-4_5-branch.orig/gcc/configure 2011-12-03 13:41:00.000000000 -0800
-+++ gcc-4_5-branch/gcc/configure 2011-12-03 13:46:12.747530321 -0800
-@@ -600,6 +600,7 @@
-
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
-+enable_target_optspace
- enable_plugin
- pluginlibs
- LIBELFINC
-@@ -915,7 +916,7 @@
- with_slibdir
- enable_poison_system_directories
- enable_plugin
--enable_target_optspace
-+with_linker_hash_style
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1663,6 +1664,8 @@
- with the compiler
- --with-system-zlib use installed libz
- --with-slibdir=DIR shared libraries in DIR [LIBDIR]
-+ --with-linker-hash-style={sysv,gnu,both}
-+ specify the linker hash style
-
- Some influential environment variables:
- CC C compiler command
-@@ -17115,7 +17118,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17114 "configure"
-+#line 17121 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -17221,7 +17224,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 17220 "configure"
-+#line 17227 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -25659,12 +25662,42 @@
-
- fi
-
--if test x"$enable_target_optspace" != x; then :
-+
-+if test x"$enable_target_optspace" != x; then
-
- $as_echo "#define ENABLE_TARGET_OPTSPACE 1" >>confdefs.h
-
- fi
-
-+# Specify what hash style to use by default.
-+
-+# Check whether --with-linker-hash-style was given.
-+if test "${with_linker_hash_style+set}" = set; then :
-+ withval=$with_linker_hash_style; case x"$withval" in
-+ xsysv)
-+ LINKER_HASH_STYLE=sysv
-+ ;;
-+ xgnu)
-+ LINKER_HASH_STYLE=gnu
-+ ;;
-+ xboth)
-+ LINKER_HASH_STYLE=both
-+ ;;
-+ *)
-+ as_fn_error "$withval is an invalid option to --with-linker-hash-style" "$LINENO" 5
-+ ;;
-+ esac
-+else
-+ LINKER_HASH_STYLE=''
-+fi
-+
-+if test x"${LINKER_HASH_STYLE}" != x; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define LINKER_HASH_STYLE "$LINKER_HASH_STYLE"
-+_ACEOF
-+
-+fi
-
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-Index: gcc-4_5-branch/gcc/configure.ac
-===================================================================
---- gcc-4_5-branch.orig/gcc/configure.ac 2011-12-03 13:41:00.000000000 -0800
-+++ gcc-4_5-branch/gcc/configure.ac 2011-12-03 13:41:04.499530358 -0800
-@@ -4664,6 +4664,30 @@
- AC_DEFINE(ENABLE_TARGET_OPTSPACE, 1, [Define to enable target optspace support.])
- fi
-
-+# Specify what hash style to use by default.
-+AC_ARG_WITH([linker-hash-style],
-+[AC_HELP_STRING([--with-linker-hash-style={sysv,gnu,both}],
-+ [specify the linker hash style])],
-+[case x"$withval" in
-+ xsysv)
-+ LINKER_HASH_STYLE=sysv
-+ ;;
-+ xgnu)
-+ LINKER_HASH_STYLE=gnu
-+ ;;
-+ xboth)
-+ LINKER_HASH_STYLE=both
-+ ;;
-+ *)
-+ AC_MSG_ERROR([$withval is an invalid option to --with-linker-hash-style])
-+ ;;
-+ esac],
-+[LINKER_HASH_STYLE=''])
-+if test x"${LINKER_HASH_STYLE}" != x; then
-+ AC_DEFINE_UNQUOTED(LINKER_HASH_STYLE, "$LINKER_HASH_STYLE",
-+ [The linker hash style])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-Index: gcc-4_5-branch/gcc/doc/install.texi
-===================================================================
---- gcc-4_5-branch.orig/gcc/doc/install.texi 2011-12-03 13:15:09.000000000 -0800
-+++ gcc-4_5-branch/gcc/doc/install.texi 2011-12-03 13:41:04.499530358 -0800
-@@ -1630,6 +1630,11 @@
- support @option{--build-id} option, a warning is issued and the
- @option{--enable-linker-build-id} option is ignored. The default is off.
-
-+@item --with-linker-hash-style=@var{choice}
-+Tells GCC to pass @option{--hash-style=@var{choice}} option to the
-+linker for all final links. @var{choice} can be one of
-+@samp{sysv}, @samp{gnu}, and @samp{both} where @samp{sysv} is the default.
-+
- @item --enable-gnu-unique-object
- @itemx --disable-gnu-unique-object
- Tells GCC to use the gnu_unique_object relocation for C++ template
-Index: gcc-4_5-branch/gcc/gcc.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/gcc.c 2011-12-03 13:41:00.000000000 -0800
-+++ gcc-4_5-branch/gcc/gcc.c 2011-12-03 13:41:04.499530358 -0800
-@@ -1917,7 +1917,8 @@
- }
- #endif
-
--#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC
-+#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC || \
-+ defined LINKER_HASH_STYLE
- # ifdef LINK_BUILDID_SPEC
- /* Prepend LINK_BUILDID_SPEC to whatever link_spec we had before. */
- obstack_grow (&obstack, LINK_BUILDID_SPEC, sizeof(LINK_BUILDID_SPEC) - 1);
-@@ -1926,6 +1927,16 @@
- /* Prepend LINK_EH_SPEC to whatever link_spec we had before. */
- obstack_grow (&obstack, LINK_EH_SPEC, sizeof(LINK_EH_SPEC) - 1);
- # endif
-+# ifdef LINKER_HASH_STYLE
-+ /* Prepend --hash-style=LINKER_HASH_STYLE to whatever link_spec we had
-+ before. */
-+ {
-+ static const char hash_style[] = "--hash-style=";
-+ obstack_grow (&obstack, hash_style, sizeof(hash_style) - 1);
-+ obstack_grow (&obstack, LINKER_HASH_STYLE, sizeof(LINKER_HASH_STYLE) - 1);
-+ obstack_1grow (&obstack, ' ');
-+ }
-+# endif
- obstack_grow0 (&obstack, link_spec, strlen (link_spec));
- link_spec = XOBFINISH (&obstack, const char *);
- #endif
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch
deleted file mode 100644
index 5f134ef33..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-the svn patch changed the BASE-VER to 4.5.1, bring it back to 4.5.0
-- Nitin A Kamble nitin.a.kamble@intel.com
-- 2010/07/20
-
---- gcc-4.5.0/gcc/BASE-VER 2010-07-20 00:57:37.000000000 -0700
-+++ gcc-4.5.0.new/gcc/BASE-VER 2010-07-20 01:06:17.000000000 -0700
-@@ -1 +1 @@
--4.5.1
-+4.5.0
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
deleted file mode 100644
index ada36a591..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-2010-06-07 Khem Raj <raj.khem@gmail.com>
-
- * libsupc++/eh_arm.cc (__cxa_end_cleanup): Use .pushsection/.popsection
- to emit inline assembly into .text section.
-
-Index: gcc-4.5/libstdc++-v3/libsupc++/eh_arm.cc
-===================================================================
---- gcc-4.5.orig/libstdc++-v3/libsupc++/eh_arm.cc 2010-06-04 23:20:18.000000000 -0700
-+++ gcc-4.5/libstdc++-v3/libsupc++/eh_arm.cc 2010-06-08 11:27:34.247541722 -0700
-@@ -157,22 +157,26 @@ __gnu_end_cleanup(void)
- // Assembly wrapper to call __gnu_end_cleanup without clobbering r1-r3.
- // Also push r4 to preserve stack alignment.
- #ifdef __thumb__
--asm (".global __cxa_end_cleanup\n"
-+asm (" .pushsection .text.__cxa_end_cleanup\n"
-+" .global __cxa_end_cleanup\n"
- " .type __cxa_end_cleanup, \"function\"\n"
- " .thumb_func\n"
- "__cxa_end_cleanup:\n"
- " push\t{r1, r2, r3, r4}\n"
- " bl\t__gnu_end_cleanup\n"
- " pop\t{r1, r2, r3, r4}\n"
--" bl\t_Unwind_Resume @ Never returns\n");
-+" bl\t_Unwind_Resume @ Never returns\n"
-+" .popsection\n");
- #else
--asm (".global __cxa_end_cleanup\n"
-+asm (" .pushsection .text.__cxa_end_cleanup\n"
-+" .global __cxa_end_cleanup\n"
- " .type __cxa_end_cleanup, \"function\"\n"
- "__cxa_end_cleanup:\n"
- " stmfd\tsp!, {r1, r2, r3, r4}\n"
- " bl\t__gnu_end_cleanup\n"
- " ldmfd\tsp!, {r1, r2, r3, r4}\n"
--" bl\t_Unwind_Resume @ Never returns\n");
-+" bl\t_Unwind_Resume @ Never returns\n"
-+" .popsection\n");
- #endif
-
- #endif
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch
deleted file mode 100644
index 70c9e8154..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh -e
-
-# DP: Build and install libstdc++_pic.a library.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-diff -ur libstdc++-v3/src/Makefile.am libstdc++-v3/src/Makefile.am
---- libstdc++-v3/src/Makefile.am~ 2004-04-16 21:04:05.000000000 +0200
-+++ libstdc++-v3/src/Makefile.am 2004-07-03 20:22:43.000000000 +0200
-@@ -210,6 +210,10 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -ur libstdc++-v3/src/Makefile.in libstdc++-v3/src/Makefile.in
---- libstdc++-v3/src/Makefile.in 2004-07-03 06:41:13.000000000 +0200
-+++ libstdc++-v3/src/Makefile.in 2004-07-03 20:25:05.000000000 +0200
-@@ -611,7 +611,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -644,6 +644,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -729,6 +730,11 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch
deleted file mode 100644
index bff745dae..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-2010-06-28 Julian Brown <julian@codesourcery.com>
-
- Merge from Sourcery G++ 4.4:
-
- Daniel Jacobowitz <dan@codesourcery.com>
- Joseph Myers <joseph@codesourcery.com>
-
- gcc/
- * doc/invoke.texi (-Wno-poison-system-directories): Document.
- * gcc.c (LINK_COMMAND_SPEC): Pass --no-poison-system-directories
- if -Wno-poison-system-directories and --error-poison-system-directories
- if -Werror=poison-system-directories to linker.
- * incpath.c: Include flags.h. Include toplev.h.
- (merge_include_chains): If ENABLE_POISON_SYSTEM_DIRECTORIES defined
- and flag_poison_system_directories is true, warn for use of
- /usr/include, /usr/local/include or /usr/X11R6/include.
- * Makefile.in (incpath.o): Depend on $(FLAGS_H) and toplev.h.
- * common.opt (--Wno-poison-system-directories): New.
- * configure.ac (--enable-poison-system-directories): New option.
- * configure: Regenerate.
- * config.in: Regenerate.
-
-Index: gcc-4.5/gcc/Makefile.in
-===================================================================
---- gcc-4.5.orig/gcc/Makefile.in 2010-09-23 16:44:12.000000000 -0700
-+++ gcc-4.5/gcc/Makefile.in 2010-09-23 16:46:33.552416860 -0700
-@@ -1969,7 +1969,7 @@ gcc.srcextra: gengtype-lex.c
-
- incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
- intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
-- $(MACHMODE_H)
-+ $(MACHMODE_H) $(FLAGS_H) toplev.h
-
- c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
- $(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) $(FUNCTION_H) output.h \
-Index: gcc-4.5/gcc/common.opt
-===================================================================
---- gcc-4.5.orig/gcc/common.opt 2010-07-11 16:14:47.000000000 -0700
-+++ gcc-4.5/gcc/common.opt 2010-09-23 16:46:33.556418045 -0700
-@@ -152,6 +152,10 @@ Wpadded
- Common Var(warn_padded) Warning
- Warn when padding is required to align structure members
-
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1)
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one local variable shadows another
-Index: gcc-4.5/gcc/config.in
-===================================================================
---- gcc-4.5.orig/gcc/config.in 2010-07-11 16:14:46.000000000 -0700
-+++ gcc-4.5/gcc/config.in 2010-09-23 16:46:33.556418045 -0700
-@@ -132,6 +132,12 @@
- #endif
-
-
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
- optimizer and back end) to be checked for dynamic type safety at runtime.
- This is quite expensive. */
-Index: gcc-4.5/gcc/configure
-===================================================================
---- gcc-4.5.orig/gcc/configure 2010-09-23 16:44:11.000000000 -0700
-+++ gcc-4.5/gcc/configure 2010-09-23 16:46:33.572415719 -0700
-@@ -913,6 +913,7 @@ with_system_zlib
- enable_maintainer_mode
- enable_version_specific_runtime_libs
- with_slibdir
-+enable_poison_system_directories
- enable_plugin
- '
- ac_precious_vars='build_alias
-@@ -1620,6 +1621,8 @@ Optional Features:
- --enable-version-specific-runtime-libs
- specify that runtime libraries should be
- installed in a compiler-specific directory
-+ --enable-poison-system-directories
-+ warn for use of native system header directories
- --enable-plugin enable plugin support
-
- Optional Packages:
-@@ -25345,6 +25348,19 @@ fi
-
-
-
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+ enableval=$enable_poison_system_directories;
-+else
-+ enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
-
-
-Index: gcc-4.5/gcc/configure.ac
-===================================================================
---- gcc-4.5.orig/gcc/configure.ac 2010-09-23 16:44:11.000000000 -0700
-+++ gcc-4.5/gcc/configure.ac 2010-09-23 16:46:33.576417624 -0700
-@@ -4439,6 +4439,16 @@ else
- fi)
- AC_SUBST(slibdir)
-
-+AC_ARG_ENABLE([poison-system-directories],
-+ AS_HELP_STRING([--enable-poison-system-directories],
-+ [warn for use of native system header directories]),,
-+ [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+ [1],
-+ [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-Index: gcc-4.5/gcc/doc/invoke.texi
-===================================================================
---- gcc-4.5.orig/gcc/doc/invoke.texi 2010-09-23 15:33:28.000000000 -0700
-+++ gcc-4.5/gcc/doc/invoke.texi 2010-09-23 16:46:33.584416934 -0700
-@@ -252,6 +252,7 @@ Objective-C and Objective-C++ Dialects}.
- -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol
- -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol
- -Wpointer-arith -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wredundant-decls @gol
- -Wreturn-type -Wsequence-point -Wshadow @gol
- -Wsign-compare -Wsign-conversion -Wstack-protector @gol
-@@ -3603,6 +3604,14 @@ code. However, note that using @option{
- option will @emph{not} warn about unknown pragmas in system
- headers---for that, @option{-Wunknown-pragmas} must also be used.
-
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling. This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-Index: gcc-4.5/gcc/gcc.c
-===================================================================
---- gcc-4.5.orig/gcc/gcc.c 2010-07-11 16:14:46.000000000 -0700
-+++ gcc-4.5/gcc/gcc.c 2010-09-23 16:46:33.588417920 -0700
-@@ -792,6 +792,8 @@ proper position among the other output f
- %{flto} %{fwhopr} %l " LINK_PIE_SPEC \
- "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
- %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
-+ %{Wno-poison-system-directories:--no-poison-system-directories}\
-+ %{Werror=poison-system-directories:--error-poison-system-directories}\
- %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
- %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)} %(mflib)\
- %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
-Index: gcc-4.5/gcc/incpath.c
-===================================================================
---- gcc-4.5.orig/gcc/incpath.c 2010-07-11 16:14:44.000000000 -0700
-+++ gcc-4.5/gcc/incpath.c 2010-09-23 16:46:33.588417920 -0700
-@@ -30,6 +30,8 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "flags.h"
-+#include "toplev.h"
-
- /* Microsoft Windows does not natively support inodes.
- VMS has non-numeric inodes. */
-@@ -353,6 +355,24 @@ merge_include_chains (const char *sysroo
- }
- fprintf (stderr, _("End of search list.\n"));
- }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+ if (flag_poison_system_directories)
-+ {
-+ struct cpp_dir *p;
-+
-+ for (p = heads[QUOTE]; p; p = p->next)
-+ {
-+ if ((!strncmp (p->name, "/usr/include", 12))
-+ || (!strncmp (p->name, "/usr/local/include", 18))
-+ || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+ warning (OPT_Wpoison_system_directories,
-+ "include location \"%s\" is unsafe for "
-+ "cross-compilation",
-+ p->name);
-+ }
-+ }
-+#endif
- }
-
- /* Use given -I paths for #include "..." but not #include <...>, and
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch
deleted file mode 100644
index 541134a6b..000000000
--- a/toolchain-layer/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch
+++ /dev/null
@@ -1,26654 +0,0 @@
-2010-07-07 Sandra Loosemore <sandra@codesourcery.com>
-
- Backport from mainline (originally from Sourcery G++ 4.4):
-
- 2010-05-24 Daniel Jacobowitz <dan@codesourcery.com>
- Sandra Loosemore <sandra@codesourcery.com>
-
- gcc/
- * config/arm/neon-testgen.ml: Use dg-add-options arm_neon.
- * doc/sourcebuild.texi (Effective-Target Keywords): Update arm_neon_ok
- description. Add arm_neon_fp16_ok.
- (Add Options): Add arm_neon and arm_neon_fp16.
-
- gcc/testsuite/
- * gcc.target/arm/neon/: Regenerated test cases.
-
- * gcc.target/arm/neon/polytypes.c,
- gcc.target/arm/neon-vmla-1.c, gcc.target/arm/neon-vmls-1.c,
- gcc.target/arm/neon-cond-1.c, gcc.target/arm/neon/vfp-shift-a2t2.c,
- gcc.target/arm/neon-thumb2-move.c, gcc.dg/torture/arm-fp16-ops-8.c,
- gcc.dg/torture/arm-fp16-ops-7.c, g++.dg/ext/arm-fp16/arm-fp16-ops-7.C,
- g++.dg/ext/arm-fp16/arm-fp16-ops-8.C, g++.dg/abi/mangle-neon.C: Use
- dg-add-options arm_neon.
-
- * gcc.target/arm/fp16-compile-vcvt.c, gcc.dg/torture/arm-fp16-ops-5.c,
- gcc.dg/torture/arm-fp16-ops-6.c, g++.dg/ext/arm-fp16/arm-fp16-ops-5.C,
- g++.dg/ext/arm-fp16/arm-fp16-ops-6.C: Use dg-add-options arm_neon_fp16
- and arm_neon_fp16_ok.
-
- * gcc.dg/vect/vect.exp, g++.dg/vect/vect.exp,
- gfortran.dg/vect/vect.exp: Use add_options_for_arm_neon.
-
- * lib/target-supports.exp (add_options_for_arm_neon): New.
- (check_effective_target_arm_neon_ok_nocache): New, from
- check_effective_target_arm_neon_ok. Check multiple possibilities.
- (check_effective_target_arm_neon_ok): Use
- check_effective_target_arm_neon_ok_nocache.
- (add_options_for_arm_neon_fp16)
- (check_effective_target_arm_neon_fp16_ok)
- check_effective_target_arm_neon_fp16_ok_nocache): New.
- (check_effective_target_arm_neon_hw): Use add_options_for_arm_neon.
-
-
-=== modified file 'gcc/config/arm/neon-testgen.ml'
-Index: gcc-4_5-branch/gcc/config/arm/neon-testgen.ml
-===================================================================
---- gcc-4_5-branch.orig/gcc/config/arm/neon-testgen.ml
-+++ gcc-4_5-branch/gcc/config/arm/neon-testgen.ml
-@@ -51,8 +51,8 @@ let emit_prologue chan test_name =
- Printf.fprintf chan "/* This file was autogenerated by neon-testgen. */\n\n";
- Printf.fprintf chan "/* { dg-do assemble } */\n";
- Printf.fprintf chan "/* { dg-require-effective-target arm_neon_ok } */\n";
-- Printf.fprintf chan
-- "/* { dg-options \"-save-temps -O0 -mfpu=neon -mfloat-abi=softfp\" } */\n";
-+ Printf.fprintf chan "/* { dg-options \"-save-temps -O0\" } */\n";
-+ Printf.fprintf chan "/* { dg-add-options arm_neon } */\n";
- Printf.fprintf chan "\n#include \"arm_neon.h\"\n\n";
- Printf.fprintf chan "void test_%s (void)\n{\n" test_name
-
-Index: gcc-4_5-branch/gcc/doc/sourcebuild.texi
-===================================================================
---- gcc-4_5-branch.orig/gcc/doc/sourcebuild.texi
-+++ gcc-4_5-branch/gcc/doc/sourcebuild.texi
-@@ -362,7 +362,7 @@ A copy of @file{texinfo.tex} known to wo
- @end table
-
- DVI-formatted manuals are generated by @samp{make dvi}, which uses
--@command{texi2dvi} (via the Makefile macro @code{$(TEXI2DVI)}).
-+@command{texi2dvi} (via the Makefile macro @code{$(TEXI2DVI)}).
- PDF-formatted manuals are generated by @samp{make pdf}, which uses
- @command{texi2pdf} (via the Makefile macro @code{$(TEXI2PDF)}). HTML
- formatted manuals are generated by @samp{make html}. Info
-@@ -1500,8 +1500,14 @@ ARM target supports generating NEON inst
- Test system supports executing NEON instructions.
-
- @item arm_neon_ok
--ARM Target supports @code{-mfpu=neon -mfloat-abi=softfp}.
--Some multilibs may be incompatible with these options.
-+@anchor{arm_neon_ok}
-+ARM Target supports @code{-mfpu=neon -mfloat-abi=softfp} or compatible
-+options. Some multilibs may be incompatible with these options.
-+
-+@item arm_neon_fp16_ok
-+@anchor{arm_neon_fp16_ok}
-+ARM Target supports @code{-mfpu=neon-fp16 -mfloat-abi=softfp} or compatible
-+options. Some multilibs may be incompatible with these options.
-
- @item arm_thumb1_ok
- ARM target generates Thumb-1 code for @code{-mthumb}.
-@@ -1895,6 +1901,16 @@ Only MIPS targets support this feature,
-
- @item tls
- Add the target-specific flags needed to use thread-local storage.
-+
-+@item arm_neon
-+NEON support. Only ARM targets support this feature, and only then
-+in certain modes; see the @ref{arm_neon_ok,,arm_neon_ok effective target
-+keyword}.
-+
-+@item arm_neon_fp16
-+NEON and half-precision floating point support. Only ARM targets
-+support this feature, and only then in certain modes; see
-+the @ref{arm_neon_ok,,arm_neon_fp16_ok effective target keyword}.
- @end table
-
- @node Require Support
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/abi/mangle-neon.C
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/abi/mangle-neon.C
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/abi/mangle-neon.C
-@@ -2,7 +2,7 @@
-
- // { dg-do compile }
- // { dg-require-effective-target arm_neon_ok }
--// { dg-options "-mfpu=neon -mfloat-abi=softfp" }
-+// { dg-add-options arm_neon }
-
- #include <arm_neon.h>
-
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-5.C
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-5.C
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-5.C
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
--/* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -mfpu=neon-fp16 -mfloat-abi=softfp" } */
-+/* { dg-require-effective-target arm_neon_fp16_ok } */
-+/* { dg-options "-mfp16-format=ieee" } */
-+/* { dg-add-options arm_neon_fp16 } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-6.C
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-6.C
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-6.C
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
--/* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -ffast-math -mfpu=neon-fp16 -mfloat-abi=softfp" } */
-+/* { dg-require-effective-target arm_neon_fp16_ok } */
-+/* { dg-options "-mfp16-format=ieee -ffast-math" } */
-+/* { dg-add-options arm_neon_fp16 } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-7.C
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-7.C
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-7.C
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-mfp16-format=ieee" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-8.C
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-8.C
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/ext/arm-fp16/arm-fp16-ops-8.C
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -ffast-math -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-mfp16-format=ieee -ffast-math" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/g++.dg/vect/vect.exp
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/g++.dg/vect/vect.exp
-+++ gcc-4_5-branch/gcc/testsuite/g++.dg/vect/vect.exp
-@@ -112,7 +112,7 @@ if [istarget "powerpc-*paired*"] {
- } elseif [istarget "ia64-*-*"] {
- set dg-do-what-default run
- } elseif [is-effective-target arm_neon_ok] {
-- lappend DEFAULT_VECTCFLAGS "-mfpu=neon" "-mfloat-abi=softfp"
-+ eval lappend DEFAULT_VECTCFLAGS [add_options_for_arm_neon ""]
- if [is-effective-target arm_neon_hw] {
- set dg-do-what-default run
- } else {
-Index: gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-5.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-5.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-5.c
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
--/* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -mfpu=neon-fp16 -mfloat-abi=softfp" } */
-+/* { dg-require-effective-target arm_neon_fp16_ok } */
-+/* { dg-options "-mfp16-format=ieee" } */
-+/* { dg-add-options arm_neon_fp16 } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-6.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-6.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-6.c
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
--/* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -ffast-math -mfpu=neon-fp16 -mfloat-abi=softfp" } */
-+/* { dg-require-effective-target arm_neon_fp16_ok } */
-+/* { dg-options "-mfp16-format=ieee -ffast-math" } */
-+/* { dg-add-options arm_neon_fp16 } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-7.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-7.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-7.c
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-mfp16-format=ieee" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.dg/torture/arm-fp16-ops-8.c
-@@ -1,7 +1,8 @@
- /* Test various operators on __fp16 and mixed __fp16/float operands. */
- /* { dg-do compile { target arm*-*-* } } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -ffast-math -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-mfp16-format=ieee -ffast-math" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm-fp16-ops.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.dg/vect/vect.exp
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.dg/vect/vect.exp
-+++ gcc-4_5-branch/gcc/testsuite/gcc.dg/vect/vect.exp
-@@ -104,7 +104,7 @@ if [istarget "powerpc-*paired*"] {
- } elseif [istarget "ia64-*-*"] {
- set dg-do-what-default run
- } elseif [is-effective-target arm_neon_ok] {
-- lappend DEFAULT_VECTCFLAGS "-mfpu=neon" "-mfloat-abi=softfp"
-+ eval lappend DEFAULT_VECTCFLAGS [add_options_for_arm_neon ""]
- if [is-effective-target arm_neon_hw] {
- set dg-do-what-default run
- } else {
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/fp16-compile-vcvt.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/fp16-compile-vcvt.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/fp16-compile-vcvt.c
-@@ -1,6 +1,7 @@
- /* { dg-do compile } */
--/* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfp16-format=ieee -mfpu=neon-fp16 -mfloat-abi=softfp" } */
-+/* { dg-require-effective-target arm_neon_fp16_ok } */
-+/* { dg-options "-mfp16-format=ieee" } */
-+/* { dg-add-options arm_neon_fp16 } */
-
- /* Test generation of VFP __fp16 instructions. */
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-cond-1.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon-cond-1.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-cond-1.c
-@@ -1,6 +1,7 @@
- /* { dg-do run } */
- /* { dg-require-effective-target arm_neon_hw } */
--/* { dg-options "-O2 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-O2" } */
-+/* { dg-add-options arm_neon } */
- /* Check that the arm_final_prescan_insn ccfsm code does not try to
- * conditionally execute NEON instructions. */
- #include <arm_neon.h>
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-thumb2-move.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon-thumb2-move.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-thumb2-move.c
-@@ -1,6 +1,7 @@
- /* { dg-do compile } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-O2 -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=neon" } */
-+/* { dg-options "-O2 -mthumb -march=armv7-a" } */
-+/* { dg-add-options arm_neon } */
-
- #include <arm_neon.h>
- #include <stddef.h>
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-vmla-1.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon-vmla-1.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-vmla-1.c
-@@ -1,5 +1,6 @@
- /* { dg-require-effective-target arm_neon_hw } */
--/* { dg-options "-O2 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize" } */
-+/* { dg-options "-O2 -ftree-vectorize" } */
-+/* { dg-add-options arm_neon } */
- /* { dg-final { scan-assembler "vmla\\.f32" } } */
-
- /* Verify that VMLA is used. */
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-vmls-1.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon-vmls-1.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon-vmls-1.c
-@@ -1,5 +1,6 @@
- /* { dg-require-effective-target arm_neon_hw } */
--/* { dg-options "-O2 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize" } */
-+/* { dg-options "-O2 -ftree-vectorize" } */
-+/* { dg-add-options arm_neon } */
- /* { dg-final { scan-assembler "vmls\\.f32" } } */
-
- /* Verify that VMLS is used. */
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/polytypes.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/polytypes.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/polytypes.c
-@@ -3,7 +3,7 @@
-
- /* { dg-do compile } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-add-options arm_neon } */
-
- #include <arm_neon.h>
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhnu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhnu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRaddhnu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRaddhnu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhadds16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhadds32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhadds8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhadds8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRhaddu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRhaddu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshls16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshls32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshls64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshls8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshls8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshlu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshlu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrQ_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshr_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshr_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRshrn_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsraQ_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsra_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsra_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhnu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhnu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vRsubhnu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vRsubhnu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabaQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabaQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabals16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabals32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabals8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabals8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabalu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabalu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabalu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabalu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabas16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabas32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabas8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabas8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabau16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabau32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabau8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabau8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdls16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdls32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdls8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdls8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdlu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdlu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdlu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdlu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabds16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabds32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabds8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabds8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabdu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabdu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabsQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabsQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabsQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabsQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabsf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabsf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabss16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabss32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vabss8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vabss8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhnu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhnu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddhnu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddhnu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddls16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddls32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddls8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddls8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddlu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddlu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddlu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddlu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vadds16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vadds32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vadds64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vadds8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vadds8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddws16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddws32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddws8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddws8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddwu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddwu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vaddwu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vaddwu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vands16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vands32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vands64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vands8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vands8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vandu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vandu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbics16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbics32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbics64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbics8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbics8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbicu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbicu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbsls16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbsls32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbsls64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbsls8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbsls8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vbslu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vbslu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcageQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcageQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcageQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcagef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagtQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcagtQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagtQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagtf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcagtf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcagtf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaleQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcaleQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaleQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcalef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcalef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcalef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaltQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcaltQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaltQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaltf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcaltf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcaltf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vceqs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vceqs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcequ16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcequ32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcequ8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcequ8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcges16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcges32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcges8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcges8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgeu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgeu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgts16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgts32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgts8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgts8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcgtu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcgtu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcles16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcles32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcles8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcles8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcleu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcleu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclsQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclsQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclsQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclsQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclss16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclss32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclss8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclss8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclts16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclts32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclts8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclts8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcltu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcltu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vclzu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vclzu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcntQp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcntQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcntQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcntp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcnts8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcnts8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcnts8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcntu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcntu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombinef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombinep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombinep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombinep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombines16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombines32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombines64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombines8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombines8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombineu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombineu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombineu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcombineu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcombineu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreatef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreatep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreatep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreatep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreates16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreates32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreates64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreates8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreates8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreateu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreateu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreateu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcreateu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcreateu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_s32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_s32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_s32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_u32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_u32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nf32_u32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_ns32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQ_ns32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_ns32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nu32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nu32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQ_nu32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_s32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_s32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_s32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_u32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_u32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQf32_u32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQs32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQs32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQs32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQu32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtQu32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtQu32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_s32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_s32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_s32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_u32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_u32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nf32_u32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_ns32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvt_ns32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_ns32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nu32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvt_nu32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvt_nu32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtf32_s32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtf32_s32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtf32_s32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtf32_u32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtf32_u32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtf32_u32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvts32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvts32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvts32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtu32_f32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vcvtu32_f32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vcvtu32_f32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_lanes8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_laneu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_nf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_np16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_np16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_np16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_np8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_np8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_np8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdupQ_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanes16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanes32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanes64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_lanes8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_lanes8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_laneu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_laneu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_laneu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_laneu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_laneu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_nf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_np16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_np16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_np16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_np8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_np8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_np8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_ns16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_ns32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_ns64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_ns8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_ns8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_nu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_nu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_nu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vdup_nu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vdup_nu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veorQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veorQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veors16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veors32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veors64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veors8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veors8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veoru16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veoru32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veoru64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/veoru8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/veoru8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextQu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextQu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vexts16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vexts32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vexts64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vexts8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vexts8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vextu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vextu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vfp-shift-a2t2.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vfp-shift-a2t2.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vfp-shift-a2t2.c
-@@ -2,7 +2,8 @@
-
- /* { dg-do compile } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps" } */
-+/* { dg-add-options arm_neon } */
-
- #include <arm_neon.h>
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_lanes8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vgetQ_laneu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highs16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highs32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highs64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highs8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highs8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_highu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_highu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanef32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanef32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanef32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanep16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanep16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanep16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanep8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanep8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanep8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanes16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanes32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanes64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lanes8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lanes8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_laneu16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_laneu32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu64.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_laneu64.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu64.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_laneu8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_laneu8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-target arm_neon_ok } */
--/* { dg-options "-save-temps -O0 -mfpu=neon -mfloat-abi=softfp" } */
-+/* { dg-options "-save-temps -O0" } */
-+/* { dg-add-options arm_neon } */
-
- #include "arm_neon.h"
-
-Index: gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
-===================================================================
---- gcc-4_5-branch.orig/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
-+++ gcc-4_5-branch/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
-@@ -3,7 +3,8 @@
-
- /* { dg-do assemble } */
- /* { dg-require-effective-