This commit is contained in:
Jakub Jelinek 2012-03-06 12:50:21 +01:00
parent acf847e63a
commit a93f055e77
4 changed files with 110 additions and 12 deletions

3
.gitignore vendored
View File

@ -13,3 +13,6 @@
/gcc-4.6.1-20110804.tar.bz2
/gcc-4.6.1-20110824.tar.bz2
/gcc-4.6.1-20110908.tar.bz2
/gcc-4.6.1-20111002.tar.bz2
/gcc-4.6.2-20111027.tar.bz2
/gcc-4.6.3-20120306.tar.bz2

109
gcc.spec
View File

@ -1,9 +1,9 @@
%global DATE 20110908
%global SVNREV 178678
%global gcc_version 4.6.1
%global DATE 20120306
%global SVNREV 184984
%global gcc_version 4.6.3
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 9
%global gcc_release 1
%global _unpackaged_files_terminate_build 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
@ -169,7 +169,6 @@ Patch15: gcc46-libstdc++-docs.patch
Patch17: gcc46-no-add-needed.patch
Patch18: gcc46-ppl-0.10.patch
Patch19: gcc46-pr47858.patch
Patch20: gcc46-pr50299.patch
Patch1000: fastjar-0.97-segfault.patch
Patch1001: fastjar-0.97-len1.patch
@ -641,7 +640,6 @@ package or when debugging this package.
%patch18 -p0 -b .ppl-0.10~
%endif
%patch19 -p0 -b .pr47858~
%patch20 -p0 -b .pr50299~
%if 0%{?_enable_debug_packages}
cat > split-debuginfo.sh <<\EOF
@ -705,7 +703,7 @@ tar xzf %{SOURCE4}
tar xjf %{SOURCE10}
%endif
sed -i -e 's/4\.6\.2/4.6.1/' gcc/BASE-VER
sed -i -e 's/4\.6\.4/4.6.3/' gcc/BASE-VER
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
@ -909,6 +907,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
%ifarch s390 s390x
--with-arch=z9-109 --with-tune=z10 --enable-decimal-float \
%endif
%ifarch armv7hl
--with-cpu=cortex-a8 --with-tune=cortex-a8 --with-arch=armv7-a \
--with-float=hard --with-fpu=vfpv3-d16 --with-abi=aapcs-linux \
%endif
%ifnarch sparc sparcv9 ppc
--build=%{gcc_target_platform}
%endif
@ -1533,6 +1535,9 @@ touch %{buildroot}%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
rm -f %{buildroot}%{mandir}/man3/ffi*
# Help plugins find out nvra.
echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver
%check
cd obj-%{gcc_target_platform}
@ -1753,6 +1758,7 @@ fi
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/rpmver
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stddef.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdarg.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdfix.h
@ -2460,6 +2466,95 @@ fi
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
%changelog
* Tue Mar 6 2012 Jakub Jelinek <jakub@redhat.com> 4.6.3-1
- update from the 4.6 branch
- GCC 4.6.3 release
- PRs ada/46192, boehm-gc/48514, boehm-gc/52179, bootstrap/49907,
bootstrap/50888, bootstrap/51686, bootstrap/51969, c++/50608,
c++/50870, c++/50901, c++/51150, c++/51161, c++/51248, c++/51265,
c++/51331, c++/51344, c++/51406, c++/51416, c++/51669, c++/51854,
c++/51868, c++/52247, c/51339, c/51360, c/52181, c/52290, debug/48190,
debug/49951, debug/51410, debug/51517, debug/51695, debug/51950,
debug/52260, driver/48306, fortran/47545, fortran/49050,
fortran/50408, fortran/50684, fortran/50923, fortran/51075,
fortran/51218, fortran/51310, fortran/51338, fortran/51435,
fortran/51448, fortran/51502, fortran/51550, fortran/51800,
fortran/51904, fortran/51913, fortran/51948, fortran/51966,
fortran/52012, fortran/52022, fortran/52093, fortran/52151,
fortran/52335, fortran/52386, libjava/48512, libmudflap/40778,
libstdc++/50862, libstdc++/50880, libstdc++/51083, libstdc++/51133,
libstdc++/51142, libstdc++/51540, libstdc++/51626, libstdc++/51711,
libstdc++/51795, libstdc++/52300, libstdc++/52309, libstdc++/52317,
lto/41159, middle-end/44777, middle-end/45678, middle-end/48071,
middle-end/48660, middle-end/50074, middle-end/51077,
middle-end/51323, middle-end/51510, middle-end/51768,
middle-end/51994, middle-end/52074, middle-end/52140,
middle-end/52230, rtl-opt/37451, rtl-opt/37782,
rtl-optimization/38644, rtl-optimization/47918,
rtl-optimization/48721, rtl-optimization/49720,
rtl-optimization/50396, rtl-optimization/51187,
rtl-optimization/51374, rtl-optimization/51469,
rtl-optimization/51767, rtl-optimization/51821,
rtl-optimization/52060, rtl-optimization/52139, target/30282,
target/40068, target/45233, target/48108, target/48743,
target/49641, target/49992, target/50313, target/50493,
target/50678, target/50691, target/50875, target/50906,
target/50945, target/50979, target/51002, target/51106,
target/51287, target/51345, target/51393, target/51408,
target/51623, target/51643, target/51756, target/51835,
target/51921, target/51934, target/52006, target/52107,
target/52129, target/52199, target/52205, target/52238,
target/52294, target/52330, target/52408, target/52425,
testsuite/51511, testsuite/52296, tree-optimization/46886,
tree-optimization/49536, tree-optimization/49642,
tree-optimization/50031, tree-optimization/50078,
tree-optimization/50569, tree-optimization/50622,
tree-optimization/50969, tree-optimization/51042,
tree-optimization/51070, tree-optimization/51118,
tree-optimization/51315, tree-optimization/51466,
tree-optimization/51485, tree-optimization/51583,
tree-optimization/51624, tree-optimization/51759,
tree-optimization/52286
- don't look for lto plugin/lto-wrapper if -E/-S/-c or in cpp (#787345)
- debuginfo related backports from trunk (PRs pch/51722, debug/52165,
debug/52132)
- fix up ccp from optimizing away non-pure/const builtin passthrough calls
with constant first argument (PR tree-optimization/51683)
* Thu Oct 27 2011 Jakub Jelinek <jakub@redhat.com> 4.6.2-1
- update from the 4.6 branch
- GCC 4.6.2 release
- PRs c++/44473, c++/49216, c++/49855, c++/49896, c++/50531, c++/50611,
c++/50618, c++/50787, c++/50793, c/50565, debug/50816, fortran/47023,
fortran/48706, fortran/50016, fortran/50273, fortran/50570,
fortran/50585, fortran/50625, fortran/50659, fortran/50718,
libobjc/49883, libobjc/50002, libstdc++/48698, middle-end/49801,
middle-end/50326, middle-end/50386, obj-c++/48275, objc-++/48275,
target/49049, target/49824, target/49965, target/49967, target/50106,
target/50350, target/50652, target/50737, target/50788, target/50820,
tree-optimization/49279, tree-optimization/50189,
tree-optimization/50700, tree-optimization/50712,
tree-optimization/50723
- add armv7hl configury options (#746843)
- add `gcc -print-file-name=rpmver` file with gcc NVRA for plugins
(#744922)
- fix build against current glibc, ctype.h changes broke libjava compilation
* Mon Oct 2 2011 Jakub Jelinek <jakub@redhat.com> 4.6.1-10
- update from the 4.6 branch
- PRs c++/20039, c++/40831, c++/42844, c++/46105, c++/48320, c++/50424,
c++/50442, c++/50491, c++/50508, inline-asm/50571, libstdc++/49559,
libstdc++/50509, libstdc++/50510, libstdc++/50529, middle-end/49886,
target/50091, target/50341, target/50464, testsuite/50487,
tree-optimization/49518, tree-optimization/49628,
tree-optimization/49911, tree-optimization/50162,
tree-optimization/50412, tree-optimization/50413,
tree-optimization/50472
- recognize IVs with REFERENCE_TYPE in simple_iv similarly to
IVs with POINTER_TYPE (#528578)
- return larger types for odd-sized precision in Fortran type_for_size
langhook if possible
* Thu Sep 8 2011 Jakub Jelinek <jakub@redhat.com> 4.6.1-9
- update from the 4.6 branch
- PRs c++/49267, c++/50089, c++/50157, c++/50207, c++/50220, c++/50224,

View File

@ -1,8 +1,8 @@
--- libada/Makefile.in.jj 2009-01-14 12:07:35.000000000 +0100
+++ libada/Makefile.in 2009-01-15 14:25:33.000000000 +0100
@@ -69,18 +69,40 @@ version := $(shell cat $(srcdir)/../gcc/
libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
@@ -72,18 +72,40 @@ libsubdir := $(libdir)/gcc/$(target_nonc
ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
+DEFAULTMULTIFLAGS :=
+ifeq ($(MULTISUBDIR),)
@ -45,7 +45,7 @@
"TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
"THREAD_KIND=$(THREAD_KIND)" \
"TRACE=$(TRACE)" \
@@ -91,7 +113,7 @@ LIBADA_FLAGS_TO_PASS = \
@@ -94,7 +116,7 @@ LIBADA_FLAGS_TO_PASS = \
"exeext=.exeext.should.not.be.used " \
'CC=the.host.compiler.should.not.be.needed' \
"GCC_FOR_TARGET=$(CC)" \
@ -53,7 +53,7 @@
+ "CFLAGS=$(strip $(CFLAGS) $(DEFAULTMULTIFLAGS) $(WARN_CFLAGS))"
# Rules to build gnatlib.
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
--- gcc/ada/sem_util.adb (revision 161677)
+++ gcc/ada/sem_util.adb (working copy)
@@ -2246,7 +2246,11 @@

View File

@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
5bb1baf5cbb43be9d7c952a00c2c750f gcc-4.6.1-20110908.tar.bz2
a83c1013d789aa312a4651ea770bff9d gcc-4.6.3-20120306.tar.bz2