Skip to contentSkip to conversation

uclibc: fix MIPS builds with disabled threads

PATCH New Waldemar Brodkorb 4 participants 4 messages Feb 5, 2016

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 uclibc: fix MIPS builds with disabled threads

There was a regression found while building for MIPS with disabled threads. Upstream patch fixed it.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 ...02-mips-fix-build-if-threads-are-disabled.patch |   59 ++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 package/uclibc/0002-mips-fix-build-if-threads-are-disabled.patch
package/uclibc/0002-mips-fix-build-if-threads-are-disabled.patch new file +59 -0
new file mode 100644
index 0000000..a74a5f9
@@ -0,0 +1,59 @@
+From b499fe614ac5b492fc0fdc6e1fbbeeb904674159 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <[email protected]>
+Date: Wed, 3 Feb 2016 21:57:04 +0100
+Subject: [PATCH] mips: fix build if threads are disabled
+
+Reported-by: Gustavo Zacarias <[email protected]>
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+---
+ libc/string/mips/memcpy.S |    4 ++--
+ libc/string/mips/memset.S |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libc/string/mips/memcpy.S b/libc/string/mips/memcpy.S
+index 3afdb2c..59f9f0a 100644
+--- a/libc/string/mips/memcpy.S
++++ b/libc/string/mips/memcpy.S
+@@ -23,7 +23,7 @@
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+ #elif _LIBC
+ # include <sysdep.h>
+-# include <regdef.h>
++# include <sys/regdef.h>
+ # include <sys/asm.h>
+ # define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+@@ -33,7 +33,7 @@
+ # define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+ #else
+-# include <regdef.h>
++# include <sys/regdef.h>
+ # include <sys/asm.h>
+ #endif
+ 
+diff --git a/libc/string/mips/memset.S b/libc/string/mips/memset.S
+index ef8ab0b..43034ce 100644
+--- a/libc/string/mips/memset.S
++++ b/libc/string/mips/memset.S
+@@ -21,7 +21,7 @@
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+ #elif _LIBC
+ # include <sysdep.h>
+-# include <regdef.h>
++# include <sys/regdef.h>
+ # include <sys/asm.h>
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+ #elif defined _COMPILING_NEWLIB
+@@ -29,7 +29,7 @@
+ # include "machine/regdef.h"
+ # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
+ #else
+-# include <regdef.h>
++# include <sys/regdef.h>
+ # include <sys/asm.h>
+ #endif
+ 
+-- 
+1.7.10.4
+
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/1 uclibc: fix MIPS builds with disabled threads

In reply to Waldemar Brodkorb

Dear Waldemar Brodkorb,

Quoted 4 lines · Waldemar Brodkorb

There was a regression found while building for MIPS with disabled threads. Upstream patch fixed it.

Signed-off-by Waldemar Brodkorb <[email protected]>
Reviewed-by Vicente Olivert Riera <[email protected]>
Tested-by Vicente Olivert Riera <[email protected]>

Without the patch:

AS libc/string/mips/memset.os
libc/string/mips/memset.S:24:21: fatal error: regdef.h: No such file or directory

  # include <regdef.h>
                      ^
compilation terminated.

With the patch:

$ file output/build/uclibc-1.0.12/.stamp_target_installed
output/build/uclibc-1.0.12/.stamp_target_installed: empty

Regards,

Vincent.

Applied
#3 lore raw

PATCH 1/1 uclibc: fix MIPS builds with disabled threads

In reply to Waldemar Brodkorb

Dear Waldemar Brodkorb,

Quoted 8 lines · Waldemar Brodkorb

There was a regression found while building for MIPS with disabled threads. Upstream patch fixed it.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 ...02-mips-fix-build-if-threads-are-disabled.patch |   59 ++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 package/uclibc/0002-mips-fix-build-if-threads-are-disabled.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com