  get_gcc_base_ver = @get_gcc_base_ver@
  host = @host@
  host_alias = @host_alias@
-@@ -780,7 +782,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \
+@@ -780,7 +784,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \
  	      -I$(MULTIBUILDTOP)../libbacktrace \
  	      -I../libbacktrace
  

 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/liboffloadmic/configure.ac b/liboffloadmic/configure.ac
index f64f182e8ef..f4d0306658c 100644
--- a/liboffloadmic/configure.ac
+++ b/liboffloadmic/configure.ac
@@ -118,9 +118,12 @@ esac
 
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL

 
       if (!load_store_pair_p
 	  && GET_MODE_SIZE (mode).is_constant (&const_size)
@@ -10855,6 +11136,7 @@ aarch64_classify_address (struct aarch64_address_info *info,
 	{
 	  poly_int64 offset;
 	  rtx sym = strip_offset_and_salt (x, &offset);
