[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. debian/1.0.9debian-1-3-gc855747

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit aa1ccbb2afeaa3ea75784b9c57018d17c9a9219a
Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
Date:   Fri Sep 16 10:00:37 2011 -0700

    Remove non-portable -m{32,64} compilation flag
    
    Signed-off-by: Antonio Terceiro <terceiro at softwarelivre.org>

diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile
index 526575f..514327a 100644
--- a/libtest/GNUmakefile
+++ b/libtest/GNUmakefile
@@ -9,8 +9,6 @@ ifeq ($(CPU),)
   CPU := $(shell uname -m | sed -e 's/i[345678]86/i386/')
 endif
 
-MODEL = 32 # Default to 32bit compiles
-
 PLATFORM = $(CPU)-$(OS)
 
 ifeq ($(OS), sunos)
@@ -96,34 +94,6 @@ ifneq ($(findstring bsd, $(OS)),)
   LDFLAGS += -pthread
 endif
 
-ifeq ($(CPU), sparcv9)
-  MODEL = 64
-endif
-
-ifeq ($(CPU), amd64)
-  MODEL = 64
-endif
-
-ifeq ($(CPU), x86_64)
-  MODEL = 64
-endif
-
-ifeq ($(CPU), ppc64)
-  MODEL = 64
-endif
-
-ifeq ($(CPU), powerpc64)
-  MODEL = 64
-endif
-
-# On platforms (linux, solaris) that support both 32bit and 64bit, force building for one or the other
-ifneq ($(or $(findstring linux, $(OS)), $(findstring solaris, $(OS))),)
-  # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags
-  # makes the libffi build choke
-  CC += -m$(MODEL)
-  LD += -m$(MODEL)
-endif
-
 LIBTEST = $(BUILD_DIR)/$(LIBNAME)
 
 all:	$(LIBTEST)

-- 
ruby-ffi.git