1
# DP: Set base version to 4.8, introduce full version 4.8.x.
3
Index: b/src/gcc/BASE-VER
4
===================================================================
10
Index: b/src/gcc/FULL-VER
11
===================================================================
13
+++ b/src/gcc/FULL-VER
16
Index: b/src/gcc/Makefile.in
17
===================================================================
18
--- a/src/gcc/Makefile.in
19
+++ b/src/gcc/Makefile.in
21
TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
23
# Variables for version information.
24
-BASEVER := $(srcdir)/BASE-VER # 4.x.y
25
+FULLVER := $(srcdir)/FULL-VER # 4.x.y
26
+BASEVER := $(srcdir)/BASE-VER # 4.x
27
DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
28
DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
29
REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
31
+FULLVER_c := $(shell cat $(FULLVER))
32
BASEVER_c := $(shell cat $(BASEVER))
33
DEVPHASE_c := $(shell cat $(DEVPHASE))
34
DATESTAMP_c := $(shell cat $(DATESTAMP))
36
# development phase collapsed to the empty string in release mode
37
# (i.e. if DEVPHASE_c is empty). The space immediately after the
38
# comma in the $(if ...) constructs is significant - do not remove it.
39
-BASEVER_s := "\"$(BASEVER_c)\""
40
+FULLVER_s := "\"$(FULLVER_c)\""
41
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
42
DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
43
PKGVERSION_s:= "\"@PKGVERSION@\""
45
intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
48
-CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s)
49
+CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(FULLVER_s)
50
prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \
51
- $(COMMON_TARGET_H) Makefile $(BASEVER)
52
+ $(COMMON_TARGET_H) Makefile $(FULLVER)
54
# Language-independent files.
56
@@ -2090,11 +2092,11 @@
60
-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
61
+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
62
-DREVISION=$(REVISION_s) \
63
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
65
-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
66
+version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
68
gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
69
$(HASHTAB_H) $(SPLAY_TREE_H) $(OBSTACK_H) $(BITMAP_H) \
70
@@ -2679,10 +2681,10 @@
71
coretypes.h $(INPUT_H) $(TM_H) $(COMMON_TARGET_H) common/common-targhooks.h
73
bversion.h: s-bversion; @true
75
- echo "#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
76
- echo "#define BUILDING_GCC_MINOR `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
77
- echo "#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
79
+ echo "#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
80
+ echo "#define BUILDING_GCC_MINOR `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
81
+ echo "#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
82
echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
86
## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
87
## several C macro definitions, just like version.o
88
build/version.o: version.c version.h \
89
- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
90
+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
91
$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
92
- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
93
+ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
94
-DREVISION=$(REVISION_s) \
95
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
96
-DBUGURL=$(BUGURL_s) -o $@ $<
98
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
99
@TARGET_SYSTEM_ROOT_DEFINE@
101
-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)
102
+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)
103
cppbuiltin.o: cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
104
$(TARGET_H) $(TARGET_DEF) $(TREE_H) $(CPP_ID_DATA_H) \
105
cppbuiltin.h version.h Makefile
106
@@ -4015,8 +4017,8 @@
107
build/gcov-iov.o -o $@
110
-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)
111
- build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \
112
+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)
113
+ build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \
115
$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
117
@@ -4281,8 +4283,8 @@
118
TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
120
# gcc-vers.texi is generated from the version files.
121
-gcc-vers.texi: $(BASEVER) $(DEVPHASE)
122
- (echo "@set version-GCC $(BASEVER_c)"; \
123
+gcc-vers.texi: $(FULLVER) $(DEVPHASE)
124
+ (echo "@set version-GCC $(FULLVER_c)"; \
125
if [ "$(DEVPHASE_c)" = "experimental" ]; \
126
then echo "@set DEVELOPMENT"; \
127
else echo "@clear DEVELOPMENT"; \
128
@@ -4660,9 +4662,11 @@
129
install-driver: installdirs xgcc$(exeext)
130
-rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
131
-$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
132
+ifneq ($(GCC_INSTALL_NAME),$(target_noncanonical)-gcc-$(version))
133
-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
134
-( cd $(DESTDIR)$(bindir) && \
135
$(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
137
-if [ -f gcc-cross$(exeext) ] ; then \
138
if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
139
rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
140
Index: b/src/libjava/Makefile.am
141
===================================================================
142
--- a/src/libjava/Makefile.am
143
+++ b/src/libjava/Makefile.am
147
## Install the .pc file.
148
- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
149
+ @pc_version=$(GCJVERSION); \
150
file="libgcj-$${pc_version}.pc"; \
151
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
152
echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
153
Index: b/src/libjava/Makefile.in
154
===================================================================
155
--- a/src/libjava/Makefile.in
156
+++ b/src/libjava/Makefile.in
157
@@ -12426,7 +12426,7 @@
158
@BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
161
- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
162
+ @pc_version=$(GCJVERSION); \
163
file="libgcj-$${pc_version}.pc"; \
164
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
165
echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
166
Index: b/src/libjava/testsuite/lib/libjava.exp
167
===================================================================
168
--- a/src/libjava/testsuite/lib/libjava.exp
169
+++ b/src/libjava/testsuite/lib/libjava.exp
172
set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
173
regexp " version \[^\n\r\]*" $text version
174
- set libjava_version [lindex $version 1]
175
+ set libjava_version 4.8
177
verbose "version: $libjava_version"