diff --git a/gcc/configure b/gcc/configure
index 7e64599b0a90ee827a349f3275d1050b80b05b06..ef0449eddff38719e02f72f7dd9a767ef8261885 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -18598,6 +18598,9 @@ if test "$GCC" = yes; then
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
   lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  if [ -z "$lt_multi_os_dir" ];then
+    lt_multi_os_dir=../lib64
+  fi
   for lt_sys_path in $lt_search_path_spec; do
     if test -d "$lt_sys_path/$lt_multi_os_dir"; then
       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff --git a/gcc/crypto-accel.cc b/gcc/crypto-accel.cc
index e7766a585c5783595b25149e05758c3868913eb3..716c4a38ba203d63825c065124102a1a82c49ac0 100644
--- a/gcc/crypto-accel.cc
+++ b/gcc/crypto-accel.cc
@@ -1251,7 +1251,7 @@ public:
 
 /* AES stage description.  Required for some specializations
    for curtain rounds.  */
-typedef enum { INPUT, MIDDLE, FINAL } aes_stage;
+typedef enum { aesINPUT, aesMIDDLE, aesFINAL } aes_stage;
 
 /* AES entity description.  It can be both round or state inside round.
    It provides interface for unified analysis between blocks of 4 parts:
@@ -1356,7 +1356,7 @@ struct state_input
 
 /* Input round state uses special input.  */
 template<>
-struct state_input<INPUT>
+struct state_input<aesINPUT>
 {
   typedef std::pair<rtx, unsigned HOST_WIDE_INT> type;
 
@@ -1389,7 +1389,7 @@ struct state_output
 
 /* Final round state generates special output.  */
 template<>
-struct state_output<FINAL>
+struct state_output<aesFINAL>
 {
   typedef std::pair<rtx, unsigned HOST_WIDE_INT> type;
 
@@ -1409,7 +1409,7 @@ struct round_input
 
 /* Input round uses special input just as its state.  */
 template<>
-struct round_input<INPUT>
+struct round_input<aesINPUT>
 {
   typedef std::pair<rtx, unsigned HOST_WIDE_INT> type;
 };
@@ -1437,7 +1437,7 @@ struct round_output
    AES encryption.  */
 template<>
 template<>
-void round_output<INPUT>::reorder<aes_decrypt_table> (type &out)
+void round_output<aesINPUT>::reorder<aes_decrypt_table> (type &out)
 {
   gcc_assert (out.size () == 4);
   std::swap (out[1], out[3]);
@@ -1445,14 +1445,14 @@ void round_output<INPUT>::reorder<aes_decrypt_table> (type &out)
 
 template<>
 template<>
-void round_output<MIDDLE>::reorder<aes_decrypt_table> (type &out)
+void round_output<aesMIDDLE>::reorder<aes_decrypt_table> (type &out)
 {
-  round_output<INPUT>::reorder<aes_decrypt_table> (out);
+  round_output<aesINPUT>::reorder<aes_decrypt_table> (out);
 }
 
 /* Final round generates special output.  */
 template<>
-struct round_output<FINAL> : state_output<FINAL>
+struct round_output<aesFINAL> : state_output<aesFINAL>
 {
   template<typename T>
   static void finalize (type &out, const T &v)
@@ -1644,14 +1644,14 @@ public:
   typedef std::map<rtx_insn *, aes_table_ref<T> > table_ref_map;
 
   /* AES states typedefs.  */
-  typedef aes_state<input_info, INPUT, T> aes_input_state;
-  typedef aes_state<round_input_info<T>, MIDDLE, T> aes_body_state;
-  typedef aes_state<round_input_info<T>, FINAL, T> aes_final_state;
+  typedef aes_state<input_info, aesINPUT, T> aes_input_state;
+  typedef aes_state<round_input_info<T>, aesMIDDLE, T> aes_body_state;
+  typedef aes_state<round_input_info<T>, aesFINAL, T> aes_final_state;
 
   /* AES rounds typedefs.  */
-  typedef aes_round<input_info, INPUT, T> aes_input_round;
-  typedef aes_round<round_input_info<T>, MIDDLE, T> aes_body_round;
-  typedef aes_round<round_input_info<T>, FINAL, T> aes_final_round;
+  typedef aes_round<input_info, aesINPUT, T> aes_input_round;
+  typedef aes_round<round_input_info<T>, aesMIDDLE, T> aes_body_round;
+  typedef aes_round<round_input_info<T>, aesFINAL, T> aes_final_round;
 
   bool run ();
 
diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc
index 12c3f7299eaac898386cb41cc8fb44f846e9e7e1..33c696f3d1d47958bdbe9907104d8cba8a83261d 100644
--- a/gcc/opts-common.cc
+++ b/gcc/opts-common.cc
@@ -1053,7 +1053,7 @@ ai_infer_optimization (int argc, const char **argv,
     dlclose (onnxruntime_lib_handle);
 
   if (model_pred == 1)
-    putenv ("AI_INFER_LEVEL=1");
+    setenv ("AI_INFER_LEVEL", "1", 1);
   return model_pred;
 }
 
@@ -1065,9 +1065,8 @@ handle_lto_option (unsigned int lang_mask,
 		   struct cl_decoded_option *&opt_array)
 {
   int ret = 0;
-  char *lan = "";
   char *compiler = xstrdup (argv[0]);
-  lan = strrchr (compiler, '/');
+  char *lan = strrchr (compiler, '/');
   if (lan != NULL)
     lan ++;
   else
@@ -1125,7 +1124,7 @@ handle_machine_option (unsigned int lang_mask,
     {
       return ret;
     }
-  int argc_hw = 6;
+  const int argc_hw = 6;
   int64_t argv_hw[argc_hw] = {
     global_options.x_param_simultaneous_prefetches,
     global_options.x_param_l1_cache_size,
diff --git a/libcc1/configure b/libcc1/configure
index 01cfb2806da6d369419855386ee8970368cc5318..3c437d69090a74270a4719a49104e4ea965ad349 100755
--- a/libcc1/configure
+++ b/libcc1/configure
@@ -9701,6 +9701,9 @@ if test "$GCC" = yes; then
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
   lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  if [ -z "$lt_multi_os_dir" ];then
+    lt_multi_os_dir=../lib64
+  fi
   for lt_sys_path in $lt_search_path_spec; do
     if test -d "$lt_sys_path/$lt_multi_os_dir"; then
       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
@@ -14865,6 +14868,9 @@ libsuffix=
 if test "$GXX" = yes; then
   libsuffix=`$CXX -print-multi-os-directory`
 fi
+if [ -z "$libsuffix" ];then
+  libsuffix=../lib64
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket libraries" >&5
diff --git a/libcc1/configure.ac b/libcc1/configure.ac
index 36f5a7e09f1c9c6fca23d4227e4b30a0234a4e1b..acd7c4c04fc66b4e572941cfafaf8aa8e04448bb 100644
--- a/libcc1/configure.ac
+++ b/libcc1/configure.ac
@@ -72,6 +72,9 @@ libsuffix=
 if test "$GXX" = yes; then
   libsuffix=`$CXX -print-multi-os-directory`
 fi
+if [ -z "$libsuffix" ];then
+  libsuffix=../lib64
+fi
 AC_SUBST(libsuffix)
 
 dnl Test for -lsocket and -lnsl.  Copied from libgo/configure.ac.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 1b17c2e3a47eba7aa75c1564116b06621ef32e1d..2bfa00de5ee713686d6eda69b9a48dc9dcbcd446 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -385,7 +385,10 @@ install-strip: install
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take CFLAGS into account as well,
 # since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
+MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory 2>/dev/null`
+ifeq ($(MULTIOSDIR),)
+ MULTIOSDIR = ../lib64
+endif
 install_to_libdir: all
 	if test -n "${target_header_dir}"; then \
 		${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
diff --git a/libtool.m4 b/libtool.m4
index 17f8e5f30749dd5326f6cb989842a2980db2ed27..86fc1e705abd8e2a1d201899f7ba06ea42ffe7a1 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2059,6 +2059,9 @@ if test "$GCC" = yes; then
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
   lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  if [ -z "$lt_multi_os_dir" ];then
+    lt_multi_os_dir=../lib64
+  fi
   for lt_sys_path in $lt_search_path_spec; do
     if test -d "$lt_sys_path/$lt_multi_os_dir"; then
       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"