2 files changed, 8 insertions, 2 deletions

diff --git a/tools/lib/subcmd/run-command.c b/tools/lib/subcmd/run-command.c
index f4f6c9eb8e59..911f83942723 100644
--- a/tools/lib/subcmd/run-command.c
+++ b/tools/lib/subcmd/run-command.c
@@ -3,6 +3,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
+#include <linux/string.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include "subcmd-util.h"
@@ -109,7 +110,7 @@ int start_command(struct child_process *cmd)
 
                 if (cmd->dir && chdir(cmd->dir))
                         die("exec %s: cd to %s failed (%s)", cmd->argv[0],
-                            cmd->dir, strerror_r(errno, sbuf, sizeof(sbuf)));
+                            cmd->dir, str_error_r(errno, sbuf, sizeof(sbuf)));
                 if (cmd->env) {
                         for (; *cmd->env; cmd->env++) {
                                 if (strchr(*cmd->env, '='))
@@ -173,7 +174,7 @@ static int wait_or_whine(pid_t pid)
                         if (errno == EINTR)
                                 continue;
                         fprintf(stderr, " Error: waitpid failed (%s)",
-                                strerror_r(errno, sbuf, sizeof(sbuf)));
+                                str_error_r(errno, sbuf, sizeof(sbuf)));
                         return -ERR_RUN_COMMAND_WAITPID;
                 }
                 if (waiting != pid)
diff --git a/tools/objtool/Build b/tools/objtool/Build
index 0e89258a3541..2457916a3943 100644
--- a/tools/objtool/Build
+++ b/tools/objtool/Build
@@ -5,9 +5,14 @@ objtool-y += special.o
 objtool-y += objtool.o
 
 objtool-y += libstring.o
+objtool-y += str_error_r.o
 
 CFLAGS += -I$(srctree)/tools/lib
 
 $(OUTPUT)libstring.o: ../lib/string.c FORCE
         $(call rule_mkdir)
         $(call if_changed_dep,cc_o_c)
+
+$(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE
+        $(call rule_mkdir)
+        $(call if_changed_dep,cc_o_c)