Index: code/unix/Makefile
===================================================================
--- code/unix/Makefile	(revision 476)
+++ code/unix/Makefile	(working copy)
@@ -313,6 +313,7 @@
   # -framework OpenAL requires 10.4 or later...for builds shipping to the
   #  public, you'll want to use USE_OPENAL_DLOPEN and ship your own OpenAL
   #  library (http://openal.org/ or http://icculus.org/al_osx/)
+  # The Intel Macs are guaranteed to have the AL framework.
   ifeq ($(USE_OPENAL),1)
     ifneq ($(USE_OPENAL_DLOPEN),1)
       CLIENT_LDFLAGS += -framework OpenAL
Index: code/tools/lcc/cpp/unix.c
===================================================================
--- code/tools/lcc/cpp/unix.c	(revision 476)
+++ code/tools/lcc/cpp/unix.c	(working copy)
@@ -90,6 +90,7 @@
 	return dp;
 }
 
+#if !MACOS_X
 /* memmove is defined here because some vendors don't provide it at
    all and others do a terrible job (like calling malloc) */
 // -- ouch, that hurts -- ln
@@ -118,3 +119,4 @@
 	}
 	return 0;
 }
+#endif
Index: code/qcommon/q_platform.h
===================================================================
--- code/qcommon/q_platform.h	(revision 476)
+++ code/qcommon/q_platform.h	(working copy)
@@ -112,8 +112,18 @@
 #elif defined __i386__
 #define ARCH_STRING "i386"
 #define Q3_LITTLE_ENDIAN
+
+// FIXME: Apple (according to google) ships a prehistoric 1.x gas, which
+// doesn't understand some of the "new" pseudo-op syntax, so assembly is
+// disabled on Intel OS X until either Apple gets their act together or
+// somebody changes the existing assembly to use the obsolete syntax
+#if id386
+#undef id386
+#define id386 0
 #endif
 
+#endif
+
 #define DLL_EXT ".dylib"
 
 #endif
Index: code/qcommon/vm_x86.c
===================================================================
--- code/qcommon/vm_x86.c	(revision 476)
+++ code/qcommon/vm_x86.c	(working copy)
@@ -1174,13 +1174,13 @@
 		memOpStack      = opStack;     
 		memEntryPoint   = entryPoint;  
 		
-		__asm__("	pushal				\r\n" \
-				"	movl %0,%%esi		\r\n" \
-				"	movl %1,%%edi		\r\n" \
-				"	call *%2			\r\n" \
-				"	movl %%esi,%0		\r\n" \
-				"	movl %%edi,%1		\r\n" \
-				"	popal				\r\n" \
+		__asm__("	pushal				\n\t" \
+				"	movl %0,%%esi		\n\t" \
+				"	movl %1,%%edi		\n\t" \
+				"	call *%2			\n\t" \
+				"	movl %%esi,%0		\n\t" \
+				"	movl %%edi,%1		\n\t" \
+				"	popal				\n\t" \
 				: "=m" (memProgramStack), "=m" (memOpStack) \
 				: "m" (memEntryPoint), "m" (memProgramStack), "m" (memOpStack) \
 				: "si", "di" \