[git commit master 1/1] nptl i686: fix pthread_cond_wait.S compilation

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Jul 14 14:05:28 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=f71c0d8af11252f119fad04938ddd5501a7df21a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

__i686 is a gcc-defined macro, so i686 build failed with:
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S: Assembler messages:
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:572: Error: junk at end of line, first unrecognized character is `1'
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:573: Error: junk at end of line, first unrecognized character is `1'
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:574: Error: junk at end of line, first unrecognized character is `1'
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:575: Error: junk at end of line, first unrecognized character is `.'
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:576: Error: junk at end of line, first unrecognized character is `1'
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:579: Error: expected comma after name `' in .size directive

Signed-off-by: Roman I Khimov <khimov at altell.ru>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 .../unix/sysv/linux/i386/i686/pthread_cond_wait.S  |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
index 9b57fba..3968df5 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
@@ -17,4 +17,5 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#undef __i686
 #include "../i486/pthread_cond_wait.S"
-- 
1.7.1



More information about the uClibc-cvs mailing list