rev. 1.291 http://cvs.linuxcnc.org/cvs/emc2/src/Makefile has the patch applied.
Thanks, Alex ----- Original Message ----- From: "Michael Buesch" <[email protected]> To: <[email protected]> Sent: Wednesday, April 29, 2009 12:39 PM Subject: Re: [Emc-developers] [PATCH] Fix EMC2 simulator compilation on PPC64 > Any news on this one? Is this going to be applied? > > > On Friday 24 April 2009 19:35:21 Michael Buesch wrote: >> This fixes the EMC2 simulator compilation on PowerPC-64. >> >> The check should probably turned upside down and check for >> (arch==x86 || arch==x86_64), but I don't know what magic strings >> uname -m spits out for various x86 flavors. >> >> So to not introduce a regression, this just adds a check for ppc64. >> Of course other nonppc-nonX86 arches are still broken after this patch. >> >> Signed-off-by: Michael Buesch <[email protected]> >> >> --- >> >> Index: src/Makefile >> =================================================================== >> --- src.orig/Makefile 2009-04-24 19:28:32.000000000 +0200 >> +++ src/Makefile 2009-04-24 19:29:25.000000000 +0200 >> @@ -748,12 +748,13 @@ EXTRA_CFLAGS += -fPIC -Os >> RTOBJS := $(sort $(foreach mod,$(obj-m),$(call TORTOBJS,$(mod)))) >> >> RTDEPS := $(sort $(patsubst objects/%.o,depends/%.d, $(RTOBJS))) >> +IS_POWERPC = test `uname -m` = ppc -o `uname -m` = ppc64 >> modules: $(patsubst %.o,../rtlib/%.so,$(obj-m)) >> ../rtlib/%.so: >> $(ECHO) Linking $@ >> @ld -r -o objects/$*.tmp $^ >> - @if test `uname -m` != ppc; then objcopy -j .rtapi_export -O binary >> objects/$*.tmp objects/$*.exp; fi >> - @if test `uname -m` != ppc; then objcopy -G __i686.get_pc_thunk.bx >> `xargs -r0n1 echo -G < objects/$*.exp | grep -ve '^-G $$' | sort -u` >> objects/$*.tmp; fi >> + @if ! $(IS_POWERPC); then objcopy -j .rtapi_export -O binary >> objects/$*.tmp objects/$*.exp; fi >> + @if ! $(IS_POWERPC); then objcopy -G __i686.get_pc_thunk.bx >> `xargs -r0n1 echo -G < objects/$*.exp | grep -ve '^-G $$' | sort -u` >> objects/$*.tmp; fi >> @ld -shared -Bsymbolic -o $@ objects/$*.tmp -lm >> >> $(sort $(RTDEPS)): depends/rt%.d: %.c >> >> > > > > -- > Greetings, Michael. > > ------------------------------------------------------------------------------ > Register Now & Save for Velocity, the Web Performance & Operations > Conference from O'Reilly Media. Velocity features a full day of > expert-led, hands-on workshops and two days of sessions from industry > leaders in dedicated Performance & Operations tracks. Use code vel09scf > and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf > _______________________________________________ > Emc-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-developers > ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
