diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2011-12-18 00:21:53 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2011-12-18 00:21:53 +0000 |
| commit | c8fe5d134bd80456d4a7c30ea1a45e3a3967d144 (patch) | |
| tree | 920082a1c4771a92041023f84facbbcfc5e8c66f /debian/patches/gccgo-version.diff | |
| parent | 1ed753c7d69c8340eebc068b1d5b31d2554ce811 (diff) | |
| download | gcc-47-c8fe5d134bd80456d4a7c30ea1a45e3a3967d144.tar.gz | |
gcc-4.7 (4.7-20111217-1) experimental; urgency=low
* GCC-4.7 snapshot build.
- Including the GFDL documentation; will stay in experimental
until the 4.7.0 release sometime next year.
* Update patches for the trunk.
* Update symbols files.
* Build libitm packages.
-- Matthias Klose <doko@debian.org> Sat, 17 Dec 2011 23:19:46 +0100
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@5759 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/gccgo-version.diff')
| -rw-r--r-- | debian/patches/gccgo-version.diff | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff index 0285cc6..2b8433c 100644 --- a/debian/patches/gccgo-version.diff +++ b/debian/patches/gccgo-version.diff @@ -1,27 +1,25 @@ # DP: Omit the subminor number from the go libdir +Index: b/src/gcc/go/Make-lang.in +=================================================================== --- a/src/gcc/go/Make-lang.in +++ b/src/gcc/go/Make-lang.in -@@ -223,13 +223,15 @@ - go/go-backend.o: go/go-backend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(TARGET_H) +@@ -234,7 +234,9 @@ + $(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) output.h $(TARGET_H) \ + $(COMMON_TARGET_H) +-CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(version)\" \ +short_version := $(shell echo $(version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/') + ++CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \ + -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" go/go-lang.o: go/go-lang.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(OPTS_H) \ $(TREE_H) $(GIMPLE_H) $(GGC_H) $(TOPLEV_H) debug.h options.h \ - $(FLAGS_H) convert.h $(DIAGNOSTIC_H) langhooks.h \ - $(LANGHOOKS_DEF_H) $(EXCEPT_H) $(TARGET_H) $(GO_C_H) \ - gt-go-go-lang.h gtype-go.h - $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ -- -DDEFAULT_TARGET_VERSION=\"$(version)\" \ -+ -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \ - -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ - -c $< $(OUTPUT_OPTION) - +Index: b/src/libgo/Makefile.in +=================================================================== --- a/src/libgo/Makefile.in +++ b/src/libgo/Makefile.in -@@ -471,7 +471,7 @@ +@@ -496,7 +496,7 @@ SUFFIXES = .c .go .gox .o .obj .lo .a @LIBGO_IS_RTEMS_TRUE@subdirs = testsuite SUBDIRS = ${subdirs} @@ -30,15 +28,17 @@ MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs PWD_COMMAND = $${PWDCMD-pwd} -@@ -541,7 +541,7 @@ +@@ -566,7 +566,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) toolexeclib_LTLIBRARIES = libgo.la toolexeclib_LIBRARIES = libgobegin.a -toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias) +toolexeclibgodir = $(toolexeclibdir)/go/$(short_version) toolexeclibgo_DATA = \ - asn1.gox \ - big.gox \ + bufio.gox \ + bytes.gox \ +Index: b/src/libgo/Makefile.am +=================================================================== --- a/src/libgo/Makefile.am +++ b/src/libgo/Makefile.am @@ -15,7 +15,7 @@ @@ -58,4 +58,4 @@ +toolexeclibgodir = $(toolexeclibdir)/go/$(short_version) toolexeclibgo_DATA = \ - asn1.gox \ + bufio.gox \ |