[pypy-svn] r79314 - pypy/trunk/pypy/translator/platform

arigo at codespeak.net arigo at codespeak.net
Sun Nov 21 17:22:48 CET 2010


Author: arigo
Date: Sun Nov 21 17:22:46 2010
New Revision: 79314

Modified:
   pypy/trunk/pypy/translator/platform/linux.py
   pypy/trunk/pypy/translator/platform/posix.py
Log:
Revert r76937, and add the workaround for Linux 32 only -- not e.g. Darwin.


Modified: pypy/trunk/pypy/translator/platform/linux.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/linux.py	(original)
+++ pypy/trunk/pypy/translator/platform/linux.py	Sun Nov 21 17:22:46 2010
@@ -27,6 +27,8 @@
 
 
 class Linux(BaseLinux):
+    shared_only = ()    # it seems that on 32-bit linux, compiling with -fPIC
+                        # gives assembler that asmgcc is not happy about.
     def library_dirs_for_libffi_a(self):
         # places where we need to look for libffi.a
         return self.library_dirs_for_libffi() + ['/usr/lib']

Modified: pypy/trunk/pypy/translator/platform/posix.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/posix.py	(original)
+++ pypy/trunk/pypy/translator/platform/posix.py	Sun Nov 21 17:22:46 2010
@@ -104,12 +104,10 @@
         else:
             target_name = exe_name.basename
 
-        cflags = self.cflags
-        if sys.maxint > 2147483647:   # XXX XXX XXX sort this out
-            if shared:
-                cflags = self.cflags + self.shared_only
-            else:
-                cflags = self.cflags + self.standalone_only
+        if shared:
+            cflags = self.cflags + self.shared_only
+        else:
+            cflags = self.cflags + self.standalone_only
 
         m = GnuMakefile(path)
         m.exe_name = exe_name



More information about the Pypy-commit mailing list