2 ===================================================================
3 --- gcc/Makefile.in.orig 2011-11-08 16:23:29.000000000 +0100
4 +++ gcc/Makefile.in 2011-11-09 11:59:34.000000000 +0100
5 @@ -792,12 +792,14 @@ GTM_H = tm.h $(tm_file_list) in
6 TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
8 # Variables for version information.
9 -BASEVER := $(srcdir)/BASE-VER # 4.x.y
10 +BASEVER := $(srcdir)/BASE-VER # 4.x
11 +FULLVER := $(srcdir)/FULL-VER # 4.x.y
12 DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
13 DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
14 REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
16 BASEVER_c := $(shell cat $(BASEVER))
17 +FULLVER_c := $(shell cat $(FULLVER))
18 DEVPHASE_c := $(shell cat $(DEVPHASE))
19 DATESTAMP_c := $(shell cat $(DATESTAMP))
21 @@ -816,6 +818,7 @@ version := $(BASEVER_c)
22 # (i.e. if DEVPHASE_c is empty). The space immediately after the
23 # comma in the $(if ...) constructs is significant - do not remove it.
24 BASEVER_s := "\"$(BASEVER_c)\""
25 +FULLVER_s := "\"$(FULLVER_c)\""
26 DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
27 DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
28 PKGVERSION_s:= "\"@PKGVERSION@\""
29 @@ -2146,11 +2149,11 @@ options-save.o: options-save.c $(CONFIG_
33 -CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
34 +CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
35 -DREVISION=$(REVISION_s) \
36 -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
38 -version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
39 +version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
41 gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
42 $(HASHTAB_H) $(SPLAY_TREE_H) $(OBSTACK_H) $(BITMAP_H) \
43 @@ -2736,10 +2739,10 @@ common/common-targhooks.o : common/commo
44 coretypes.h $(INPUT_H) $(TM_H) $(COMMON_TARGET_H) common/common-targhooks.h
46 bversion.h: s-bversion; @true
48 - echo "#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
49 - echo "#define BUILDING_GCC_MINOR `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
50 - echo "#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
52 + echo "#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
53 + echo "#define BUILDING_GCC_MINOR `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
54 + echo "#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
55 echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
58 @@ -3811,9 +3814,9 @@ build/%.o : # dependencies provided by
59 ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
60 ## several C macro definitions, just like version.o
61 build/version.o: version.c version.h \
62 - $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
63 + $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
64 $(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
65 - -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
66 + -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
67 -DREVISION=$(REVISION_s) \
68 -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
69 -DBUGURL=$(BUGURL_s) -o $@ $<
70 @@ -3988,7 +3991,7 @@ PREPROCESSOR_DEFINES = \
71 -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
72 @TARGET_SYSTEM_ROOT_DEFINE@
74 -CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)
75 +CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)
76 cppbuiltin.o: cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
77 $(TREE_H) cppbuiltin.h Makefile
79 @@ -4008,8 +4011,8 @@ build/gcov-iov$(build_exeext): build/gco
80 build/gcov-iov.o -o $@
83 -s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)
84 - build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \
85 +s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)
86 + build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \
88 $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
90 Index: libjava/Makefile.am
91 ===================================================================
92 --- libjava/Makefile.am.orig 2011-11-03 16:30:42.000000000 +0100
93 +++ libjava/Makefile.am 2011-11-09 11:59:34.000000000 +0100
94 @@ -774,7 +774,7 @@ install_data_local_split = 50
97 ## Install the .pc file.
98 - @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
99 + @pc_version=`echo $(GCJVERSION)`; \
100 file="libgcj-$${pc_version}.pc"; \
101 $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
102 echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
103 Index: libjava/Makefile.in
104 ===================================================================
105 --- libjava/Makefile.in.orig 2011-11-03 16:31:17.000000000 +0100
106 +++ libjava/Makefile.in 2011-11-09 11:59:34.000000000 +0100
107 @@ -12411,7 +12411,7 @@ install-exec-hook: install-binPROGRAMS i
108 @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
111 - @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
112 + @pc_version=`echo $(GCJVERSION)`; \
113 file="libgcj-$${pc_version}.pc"; \
114 $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
115 echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
116 Index: libjava/testsuite/lib/libjava.exp
117 ===================================================================
118 --- libjava/testsuite/lib/libjava.exp.orig 2011-04-18 12:48:54.000000000 +0200
119 +++ libjava/testsuite/lib/libjava.exp 2011-11-09 11:59:34.000000000 +0100
120 @@ -177,7 +177,7 @@ proc libjava_init { args } {
122 set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
123 regexp " version \[^\n\r\]*" $text version
124 - set libjava_version [lindex $version 1]
125 + set libjava_version 4.7
127 verbose "version: $libjava_version"
129 Index: gcc/cppbuiltin.c
130 ===================================================================
131 --- gcc/cppbuiltin.c.orig 2011-03-14 15:04:06.000000000 +0100
132 +++ gcc/cppbuiltin.c 2012-01-24 10:22:18.000000000 +0100
133 @@ -38,9 +38,9 @@ parse_basever (int *major, int *minor, i
134 static int s_major = -1, s_minor, s_patchlevel;
137 - if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
138 + if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
140 - sscanf (BASEVER, "%d.%d", &s_major, &s_minor);
141 + sscanf (version_string, "%d.%d", &s_major, &s_minor);