diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9dd122187..3ac0275ec 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-02  Jiri Malak  <Jiri.Malak@geac.cz>
+
+	* include/winnt.h (GetCurrentFiber, GetFiberData): Make inline
+	assembly code conditional on _X86_.
+
 2005-01-02  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/w32api.h: Increment version.
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index d5c3b7807..754807e92 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -3346,6 +3346,7 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
 PVOID GetCurrentFiber(void);
 PVOID GetFiberData(void);
 
+#ifdef _X86_
 #if defined(__GNUC__)
 #if (__GNUC__ >= 3)
 /* Support -masm=intel.  */
@@ -3432,6 +3433,7 @@ static __inline__ struct _TEB * NtCurrentTeb(void)
         modify [eax];
         
 #endif /* __GNUC__ */
+#endif /* _X86_ */
 
 #endif /* RC_INVOKED */