[ros-diffs] [arty] 29071: Fix build for new rosbe-ppc.

[arty at svn.reactos.org]

Author: arty
Date: Mon Sep 17 09:32:04 2007
New Revision: 29071

URL: http://svn.reactos.org/svn/reactos?rev=29071&view=rev
Log:
Fix build for new rosbe-ppc.

Modified:
    branches/powerpc/reactos/lib/mmu/ppcmmu.mak
    trunk/reactos/include/psdk/intrin_ppc.h

Modified: branches/powerpc/reactos/lib/mmu/ppcmmu.mak
URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.mak?rev=29071&r1=29070&r2=29071&view=diff
==============================================================================
--- branches/powerpc/reactos/lib/mmu/ppcmmu.mak (original)
+++ branches/powerpc/reactos/lib/mmu/ppcmmu.mak Mon Sep 17 09:32:04 2007
@@ -1,30 +1,32 @@
-O=obj-ppc/lib/ppcmmu
+O=$(INTERMEDIATE)/lib/ppcmmu
 S=lib/ppcmmu
-CC=powerpc-unknown-linux-gnu-gcc -I$T/include/reactos/ppcmmu
-AR=powerpc-unknown-linux-gnu-ar
-OBJCOPY=powerpc-unknown-linux-gnu-objcopy
+CC=powerpc-unknown-elf-gcc -I$T/include/reactos/ppcmmu
+AR=powerpc-unknown-elf-ar
+OBJCOPY=powerpc-unknown-elf-objcopy
 LDSCRIPT=-Wl,-T,$S/ldscript
 PPCMMU_TARGETS=$O/libppcmmu.a $O/libppcmmu_code.a
 
+$O:
+	mkdir -p $O
 
-$O/libppcmmu.a: $O/mmuutil.o
+$O/libppcmmu.a: $O/mmuutil.o | $O
 	mkdir -p `dirname $@`
 	$(AR) cr $@ $O/mmuutil.o
 
-$O/mmuutil.o: $S/mmuutil.c
+$O/mmuutil.o: $S/mmuutil.c | $O
 	$(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c
 
-$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil.o $O/mmutest.o
+$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil.o $O/mmutest.o | $O
 	$(CC) -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil.o $O/mmutest.o
 	$(OBJCOPY) -O binary $O/mmuobject mmucode
 	$(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o
 	mkdir -p `dirname $@`
 	$(AR) cr $@ $O/mmucode.o
 
-$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h
+$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | $O
 	$(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c
 
-$O/mmutest.o: $S/mmutest.c $S/mmuobject.h
+$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | $O
 	$(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c
 
 ppcmmu_clean:

Modified: trunk/reactos/include/psdk/intrin_ppc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?rev=29071&r1=29070&r2=29071&view=diff
==============================================================================
--- trunk/reactos/include/psdk/intrin_ppc.h (original)
+++ trunk/reactos/include/psdk/intrin_ppc.h Mon Sep 17 09:32:04 2007
@@ -447,23 +447,6 @@
 
 	return (y & ~mask) != 0;
 }
-
-static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand)
-{
-	long retval = Comperand;
-	__asm__ __volatile__ (
-	    "sync\n"
-	    "1: lwarx   %0,0,%1\n"
-	    "   subf.   %0,%2,%0\n"
-	    "   bne     2f\n"
-	    "   stwcx.  %3,0,%1\n"
-	    "   bne-    1b\n"
-	    "2: isync"
-	    : "=b" (retval)
-	    : "b" (Destination), "r" (Comperand), "r" (Exchange)
-	    : "cr0", "memory");
-	return retval;
-}
 #endif
 
 static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend)