From 26ed387d7faec2e86289855098f08c56986e2568 Mon Sep 17 00:00:00 2001
From: auREAX <mark@xn--hwg34fba.ws>
Date: Fri, 5 Oct 2012 00:08:34 +0200
Subject: [PATCH] Rename configure --enable-pax-marks flag to
 --enable-pax-flags flag.

---
 configure    | 14 +++++++-------
 mk/stage0.mk |  4 ++--
 mk/target.mk |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index dd734f53a3fd2..58fc25eea9e44 100755
--- a/configure
+++ b/configure
@@ -295,7 +295,7 @@ opt manage-submodules 1 "let the build manage the git submodules"
 opt mingw-cross 0 "cross-compile for win32 using mingw"
 opt clang 0 "prefer clang to gcc for building the runtime"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
-opt pax-marks 0 "apply PaX markings to rustc binaries (required for GRSecurity/PaX-patched kernels)"
+opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
 valopt prefix "/usr/local" "set installation prefix"
 valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"
@@ -362,12 +362,12 @@ fi
 
 if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
 then
-    if [ ! -z "$CFG_ENABLE_PAX_MARKS" -a -z "$CFG_PAXCTL" ]
+    if [ ! -z "$CFG_ENABLE_PAX_FLAGS" -a -z "$CFG_PAXCTL" ]
     then
         err "enabled PaX markings but no paxctl binary found"
     fi
 
-    if [ -z "$CFG_DISABLE_PAX_MARKS" ]
+    if [ -z "$CFG_DISABLE_PAX_FLAGS" ]
     then
         # GRSecurity/PaX detection. This can be very flaky.
         GRSEC_DETECTED=
@@ -395,9 +395,9 @@ then
             step_msg "GRSecurity: yes"
             if [ ! -z "$CFG_PAXCTL" ]
             then
-                CFG_ENABLE_PAX_MARKS=1
+                CFG_ENABLE_PAX_FLAGS=1
             else
-                warn "GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_MARKS"
+                warn "GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_FLAGS"
             fi
         else
             step_msg "GRSecurity: no"
@@ -750,9 +750,9 @@ putvar CFG_C_COMPILER
 putvar CFG_LIBDIR
 putvar CFG_DISABLE_MANAGE_SUBMODULES
 
-if [ ! -z "$CFG_ENABLE_PAX_MARKS" ]
+if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
 then
-    putvar CFG_ENABLE_PAX_MARKS
+    putvar CFG_ENABLE_PAX_FLAGS
     putvar CFG_PAXCTL
 fi
 
diff --git a/mk/stage0.mk b/mk/stage0.mk
index fae6b3742f815..b64f5df9ca038 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -12,8 +12,8 @@ ifdef CFG_ENABLE_LOCAL_RUST
 	$(Q)$(S)src/etc/local_stage0.sh $(CFG_HOST_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
 else 
 	$(Q)$(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
-ifdef CFG_ENABLE_PAX_MARKS
-	@$(call E, apply PaX markings: $@)
+ifdef CFG_ENABLE_PAX_FLAGS
+	@$(call E, apply PaX flags: $@)
 	@"$(CFG_PAXCTL)" -cm "$@"
 endif
 endif 
diff --git a/mk/target.mk b/mk/target.mk
index 458d2a4ac63bf..967191ab74509 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -29,8 +29,8 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
 		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$<
-ifdef CFG_ENABLE_PAX_MARKS
-	@$$(call E, apply PaX markings: $$@)
+ifdef CFG_ENABLE_PAX_FLAGS
+	@$$(call E, apply PaX flags: $$@)
 	@"$(CFG_PAXCTL)" -cm "$$@"
 endif