Import gcc-9 (9.2.1-19)debian/9.2.1-19debian

1 files changed, 10 insertions, 20 deletions

diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index a2c29d3..d397de0 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -1,11 +1,9 @@
 # DP: Use /usr/include/<multiarch>/c++/4.x as the include directory
 # DP: for host dependent c++ header files.
 
-Index: b/src/libstdc++-v3/include/Makefile.am
-===================================================================
 --- a/src/libstdc++-v3/include/Makefile.am
 +++ b/src/libstdc++-v3/include/Makefile.am
-@@ -911,7 +911,7 @@ endif
+@@ -969,7 +969,7 @@ endif
  
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${host_alias}/bits
@@ -14,11 +12,9 @@ Index: b/src/libstdc++-v3/include/Makefile.am
  host_headers = \
  	${host_srcdir}/ctype_base.h \
  	${host_srcdir}/ctype_inline.h \
-Index: b/src/libstdc++-v3/include/Makefile.in
-===================================================================
 --- a/src/libstdc++-v3/include/Makefile.in
 +++ b/src/libstdc++-v3/include/Makefile.in
-@@ -1193,7 +1193,7 @@ profile_impl_headers = \
+@@ -1306,7 +1306,7 @@ profile_impl_headers = \
  @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers}
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${host_alias}/bits
@@ -27,11 +23,9 @@ Index: b/src/libstdc++-v3/include/Makefile.in
  host_headers = \
  	${host_srcdir}/ctype_base.h \
  	${host_srcdir}/ctype_inline.h \
-Index: b/src/gcc/Makefile.in
-===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -1139,6 +1139,7 @@ FLAGS_TO_PASS = \
+@@ -1172,6 +1172,7 @@ FLAGS_TO_PASS = \
  	"prefix=$(prefix)" \
  	"local_prefix=$(local_prefix)" \
  	"gxx_include_dir=$(gcc_gxx_include_dir)" \
@@ -39,13 +33,13 @@ Index: b/src/gcc/Makefile.in
  	"build_tooldir=$(build_tooldir)" \
  	"gcc_tooldir=$(gcc_tooldir)" \
  	"bindir=$(bindir)" \
-@@ -1636,6 +1637,14 @@ ifneq ($(xmake_file),)
+@@ -1721,6 +1722,14 @@ ifneq ($(xmake_file),)
  include $(xmake_file)
  endif
  
 +# Directory in which the compiler finds target-dependent g++ includes.
 +ifneq ($(call if_multiarch,non-empty),)
-+  gcc_gxx_tool_include_dir = $(libsubdir)/$(libsubdir_to_prefix)include/$(MULTIARCH_DIRNAME)/c++/$(BASEVER_c)
++  gcc_gxx_tool_include_dir = $(libsubdir)/$(libsubdir_to_prefix)include/$(MULTIARCH_DIRNAME)/c++/$(version)
 +else
 +  gcc_gxx_tool_include_dir = $(gcc_gxx_include_dir)/$(target_noncanonical)
 +endif
@@ -54,7 +48,7 @@ Index: b/src/gcc/Makefile.in
  # all-tree.def includes all the tree.def files.
  all-tree.def: s-alltree; @true
  s-alltree: Makefile
-@@ -2673,7 +2682,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2846,7 +2855,7 @@ PREPROCESSOR_DEFINES = \
    -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
    -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
@@ -63,8 +57,6 @@ Index: b/src/gcc/Makefile.in
    -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
    -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
    -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-Index: b/src/gcc/cppdefault.c
-===================================================================
 --- a/src/gcc/cppdefault.c
 +++ b/src/gcc/cppdefault.c
 @@ -49,6 +49,8 @@ const struct default_include cpp_include
@@ -76,11 +68,9 @@ Index: b/src/gcc/cppdefault.c
  #endif
  #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
      /* Pick up GNU C++ backward and deprecated include files.  */
-Index: b/src/gcc/incpath.c
-===================================================================
 --- a/src/gcc/incpath.c
 +++ b/src/gcc/incpath.c
-@@ -158,6 +158,18 @@ add_standard_paths (const char *sysroot,
+@@ -159,6 +159,18 @@ add_standard_paths (const char *sysroot,
  			}
  		      str = reconcat (str, str, dir_separator_str,
  				      imultiarch, NULL);
@@ -97,9 +87,9 @@ Index: b/src/gcc/incpath.c
 +			str = reconcat (str, str, dir_separator_str,
 +					imultiarch, NULL);
  		    }
- 		  add_path (str, SYSTEM, p->cxx_aware, false);
+ 		  add_path (str, INC_SYSTEM, p->cxx_aware, false);
  		}
-@@ -222,7 +234,16 @@ add_standard_paths (const char *sysroot,
+@@ -223,7 +235,16 @@ add_standard_paths (const char *sysroot,
  		  free (str);
  		  continue;
  		}
@@ -116,4 +106,4 @@ Index: b/src/gcc/incpath.c
 +		str = reconcat (str, str, dir_separator_str, imultiarch, NULL);
  	    }
  
- 	  add_path (str, SYSTEM, p->cxx_aware, false);
+ 	  add_path (str, INC_SYSTEM, p->cxx_aware, false);