diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c
index 76d68698143..ac799617e3e 100644
--- a/sched/sched/sched_waitpid.c
+++ b/sched/sched/sched_waitpid.c
@@ -335,17 +335,6 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 
   (void)enter_cancellation_point();
 
-  /* None of the options are supported */
-
-#ifdef CONFIG_DEBUG_FEATURES
-  if (options != 0)
-    {
-      set_errno(ENOSYS);
-      leave_cancellation_point();
-      return ERROR;
-    }
-#endif
-
   /* Create a signal set that contains only SIGCHLD */
 
   (void)sigemptyset(&set);
diff --git a/tools/mkexport.sh b/tools/mkexport.sh
index af50330b165..08c0cdc37b7 100755
--- a/tools/mkexport.sh
+++ b/tools/mkexport.sh
@@ -216,8 +216,8 @@ if [ "X${USRONLY}" == "Xy" ]; then
 	echo "LD               = ${LD}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "AR               = ${AR}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "NM               = ${NM}" >>"${EXPORTDIR}/build/Make.defs"
-	echo "OBJCOPY          = ${OBJCOPY}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "STRIP            = ${STRIP}" >>"${EXPORTDIR}/build/Make.defs"
+	echo "OBJCOPY          = ${OBJCOPY}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "OBJDUMP          = ${OBJDUMP}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "NXFLATLDFLAGS1   = ${NXFLATLDFLAGS1}" >>"${EXPORTDIR}/build/Make.defs"
 	echo "NXFLATLDFLAGS2   = ${NXFLATLDFLAGS2}" >>"${EXPORTDIR}/build/Make.defs"