Revert "gcc: gcc dir version"

This patch was created long time ago. Nowadays
version of GCC cannot be fully bootstrapped & regtested
in the independent environment (i. e. outside GBS or
OBS chroot). But we need to bootstrap & regtest so that
to be sure that or new changes in compiler do not cause
new regressions. This is a requirement of open source
GCC community and we need to fulfill it if we want to
submit any patches to upstream.

This reverts commit d2c4b00dc3a12f0563fd29933c6ff93682bd4910.

Change-Id: I61a0c30d62b1d6f0fe6dc227a5be37afcd508ec4
Signed-off-by: Ilya Palachev <i.palachev@samsung.com>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 68a5ace..fd6d126 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -810,14 +810,12 @@ GTM_H     = tm.h      $(tm_file_list) insn-constants.h
 TM_H      = $(GTM_H) insn-flags.h $(OPTIONS_H)
 
 # Variables for version information.
-BASEVER     := $(srcdir)/BASE-VER  # 4.x
-FULLVER     := $(srcdir)/FULL-VER  # 4.x.y
+BASEVER     := $(srcdir)/BASE-VER  # 4.x.y
 DEVPHASE    := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
 DATESTAMP   := $(srcdir)/DATESTAMP # YYYYMMDD or empty
 REVISION    := $(srcdir)/REVISION  # [BRANCH revision XXXXXX]
 
 BASEVER_c   := $(shell cat $(BASEVER))
-FULLVER_c   := $(shell cat $(FULLVER))
 DEVPHASE_c  := $(shell cat $(DEVPHASE))
 DATESTAMP_c := $(shell cat $(DATESTAMP))
 
@@ -836,7 +834,6 @@ version     := $(BASEVER_c)
 # (i.e. if DEVPHASE_c is empty).  The space immediately after the
 # comma in the $(if ...) constructs is significant - do not remove it.
 BASEVER_s   := "\"$(BASEVER_c)\""
-FULLVER_s   := "\"$(FULLVER_c)\""
 DEVPHASE_s  := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
 DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
 PKGVERSION_s:= "\"@PKGVERSION@\""
@@ -1984,7 +1981,7 @@ s-options-h: optionlist $(srcdir)/opt-functions.awk $(srcdir)/opt-read.awk \
 
 dumpvers: dumpvers.c
 
-CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
+CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
        -DREVISION=$(REVISION_s) \
        -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
        -DBUGURL=$(BUGURL_s)
@@ -1994,10 +1991,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
 CFLAGS-lto-compress.o += $(ZLIBINC)
 
 bversion.h: s-bversion; @true
-s-bversion: FULL-VER
-       echo "#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
-       echo "#define BUILDING_GCC_MINOR `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
-       echo "#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
+s-bversion: BASE-VER
+       echo "#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h
+       echo "#define BUILDING_GCC_MINOR `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h
+       echo "#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h
        echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
        $(STAMP) s-bversion
 
@@ -2350,9 +2347,9 @@ build/%.o :  # dependencies provided by explicit rule later
 ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
 ## several C macro definitions, just like version.o
 build/version.o:  version.c version.h \
-                  $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
+                  $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
        $(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
-       -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
+       -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
        -DREVISION=$(REVISION_s) \
        -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
        -DBUGURL=$(BUGURL_s) -o $@ $<
@@ -2545,8 +2542,8 @@ PREPROCESSOR_DEFINES = \
   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
   @TARGET_SYSTEM_ROOT_DEFINE@
 
-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)
-cppbuiltin.o: $(FULLVER)
+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)
+cppbuiltin.o: $(BASEVER)
 
 CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)
 
@@ -2562,8 +2559,8 @@ build/gcov-iov$(build_exeext): build/gcov-iov.o
                build/gcov-iov.o -o $@
 
 gcov-iov.h: s-iov
-s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)
-       build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \
+s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)
+       build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \
            > tmp-gcov-iov.h
        $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
        $(STAMP) s-iov

diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index ce0c8db..8b2c6b4 100644 (file)
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -37,9 +37,9 @@ parse_basever (int *major, int *minor, int *patchlevel)
   static int s_major = -1, s_minor, s_patchlevel;
 
   if (s_major == -1)
-    if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
+    if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
       {
-       sscanf (version_string, "%d.%d", &s_major, &s_minor);
+       sscanf (BASEVER, "%d.%d", &s_major, &s_minor);
        s_patchlevel = 0;
       }
 

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2e828ad..39b5199 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -779,7 +779,7 @@ install_data_local_split = 50
 install-data-local:
        $(PRE_INSTALL)
 ## Install the .pc file.
-       @pc_version=`echo $(GCJVERSION)`; \
+       @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \
        $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 9267682..f0f6350 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -12455,7 +12455,7 @@ install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \
 @BUILD_ECJ1_TRUE@      mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 install-data-local:
        $(PRE_INSTALL)
-       @pc_version=`echo $(GCJVERSION)`; \
+       @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \
        $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 7b067a5..0de823b 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -177,7 +177,7 @@ proc libjava_init { args } {
 
     set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
     regexp " version \[^\n\r\]*" $text version
-    set libjava_version 4.8
+    set libjava_version [lindex $version 1]
 
     verbose "version: $libjava_version"