diff -crN openGauss-server-2.1.0/src/bin/psql/startup.cpp openGauss-server-2.1.0-edit/src/bin/psql/startup.cpp
*** openGauss-server-2.1.0/src/bin/psql/startup.cpp	2021-12-13 16:23:09.000000000 +0800
--- openGauss-server-2.1.0-edit/src/bin/psql/startup.cpp	2022-01-22 22:08:39.420475340 +0800
***************
*** 257,262 ****
--- 257,266 ----
          pset.popt.topt.recordSep.separator_zero = false;
      }
  
+     if (options.port == NULL) {
+         options.port = GetEnvStr("PORT");
+     }
+ 
      if (options.username == NULL)
          password_prompt = pg_strdup(_("Password: "));
      else {
***************
*** 1334,1337 ****
              KEY_LEN);
          exit(EXIT_FAILURE);
      }
! }
\ No newline at end of file
--- 1338,1341 ----
              KEY_LEN);
          exit(EXIT_FAILURE);
      }
! }
diff -crN openGauss-server-2.1.0/src/gausskernel/dbmind/db4ai/executor/Makefile openGauss-server-2.1.0-edit/src/gausskernel/dbmind/db4ai/executor/Makefile
*** openGauss-server-2.1.0/src/gausskernel/dbmind/db4ai/executor/Makefile	2021-12-13 16:23:09.000000000 +0800
--- openGauss-server-2.1.0-edit/src/gausskernel/dbmind/db4ai/executor/Makefile	2022-01-22 22:09:13.399068986 +0800
***************
*** 11,20 ****
  
  include $(top_builddir)/src/Makefile.global
  
- PLATFORM_ARCH = $(shell uname -p)
- ifeq ($(PLATFORM_ARCH),x86_64)
-         override CPPFLAGS += -mavx
- endif
  
  ifneq "$(MAKECMDGOALS)" "clean"
    ifneq "$(MAKECMDGOALS)" "distclean"
--- 11,16 ----