9e432acb0d
OBS-URL: https://build.opensuse.org/request/show/442025 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=1
103 lines
4.6 KiB
Diff
103 lines
4.6 KiB
Diff
Index: gcc/Makefile.in
|
|
===================================================================
|
|
--- gcc/Makefile.in.orig 2016-08-30 12:17:09.065533526 +0200
|
|
+++ gcc/Makefile.in 2016-08-30 12:18:38.402596792 +0200
|
|
@@ -828,12 +828,14 @@ GTM_H = tm.h $(tm_file_list) in
|
|
TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
|
|
|
|
# Variables for version information.
|
|
-BASEVER := $(srcdir)/BASE-VER # 4.x.y
|
|
+BASEVER := $(srcdir)/BASE-VER # 5
|
|
+FULLVER := $(srcdir)/FULL-VER # 5.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))
|
|
|
|
@@ -857,6 +859,7 @@ PATCHLEVEL_c := \
|
|
# 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)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
|
|
@@ -2074,7 +2077,7 @@ s-options-h: optionlist $(srcdir)/opt-fu
|
|
|
|
dumpvers: dumpvers.c
|
|
|
|
-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
|
|
+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
|
|
-DREVISION=$(REVISION_s) \
|
|
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
|
|
-DBUGURL=$(BUGURL_s)
|
|
@@ -2084,10 +2087,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BA
|
|
CFLAGS-lto-compress.o += $(ZLIBINC)
|
|
|
|
bversion.h: s-bversion; @true
|
|
-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
|
|
+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
|
|
echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
|
|
$(STAMP) s-bversion
|
|
|
|
@@ -2476,9 +2479,9 @@ build/%.o : # dependencies provided by
|
|
## 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) $(BASEVER) $(DEVPHASE)
|
|
+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
|
|
$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \
|
|
- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
|
|
+ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
|
|
-DREVISION=$(REVISION_s) \
|
|
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
|
|
-DBUGURL=$(BUGURL_s) -o $@ $<
|
|
@@ -2701,8 +2704,8 @@ PREPROCESSOR_DEFINES = \
|
|
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
|
|
@TARGET_SYSTEM_ROOT_DEFINE@
|
|
|
|
-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)
|
|
-cppbuiltin.o: $(BASEVER)
|
|
+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)
|
|
+cppbuiltin.o: $(FULLVER)
|
|
|
|
CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)
|
|
|
|
@@ -2718,8 +2721,8 @@ build/gcov-iov$(build_exeext): build/gco
|
|
build/gcov-iov.o -o $@
|
|
|
|
gcov-iov.h: s-iov; @true
|
|
-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)
|
|
- build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \
|
|
+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)
|
|
+ build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \
|
|
> tmp-gcov-iov.h
|
|
$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
|
|
$(STAMP) s-iov
|
|
Index: gcc/cppbuiltin.c
|
|
===================================================================
|
|
--- gcc/cppbuiltin.c.orig 2016-08-30 12:17:09.069533573 +0200
|
|
+++ gcc/cppbuiltin.c 2016-08-30 12:17:14.505598282 +0200
|
|
@@ -36,9 +36,9 @@ parse_basever (int *major, int *minor, i
|
|
static int s_major = -1, s_minor, s_patchlevel;
|
|
|
|
if (s_major == -1)
|
|
- if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
|
|
+ if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
|
|
{
|
|
- sscanf (BASEVER, "%d.%d", &s_major, &s_minor);
|
|
+ sscanf (version_string, "%d.%d", &s_major, &s_minor);
|
|
s_patchlevel = 0;
|
|
}
|
|
|