diff --git a/src/common/pgxc/tools/makesgml/Makefile b/src/common/pgxc/tools/makesgml/Makefile
index 50f174cda..3156016e0 100644
--- a/src/common/pgxc/tools/makesgml/Makefile
+++ b/src/common/pgxc/tools/makesgml/Makefile
@@ -15,7 +15,7 @@ subdir = src/common/pgxc/tools/makesgml
 top_builddir = ../../../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -Wl,-z,relro,-z,now
 
 ifeq ($(enable_memory_check), yes)
   LDFLAGS += -l$(MEMCHECK_LIB_NAME_ASAN) -lpthread -ldl -lm -lrt
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 00eafb532..61a619fa4 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -20,8 +20,8 @@ ifeq ($(PLAT_FORM_STR), Failed)
         exit 1;
 endif
 
-override CPPFLAGS := $(filter-out -fPIE, $(CPPFLAGS)) -fPIC
-override CFLAGS := $(filter-out -fPIE, $(CFLAGS)) -fPIC
+override CPPFLAGS := $(filter-out -fPIE, $(CPPFLAGS)) -fPIC -Wl,-z,relro,-z,now
+override CFLAGS := $(filter-out -fPIE, $(CFLAGS)) -fPIC -Wl,-z,relro,-z,now
 
 # file with extra config for temp build
 TEMP_CONF = --temp-config=$(srcdir)/make_check_postgresql.conf