[patch] Patch to fix executable stack and disable debug of translation

pypy-1.5.patch (text/plain), 2.00 KB, created by Ilya Osadchiy on 2011-05-27 16:23:00 UTC

diff -ur pypy-1.5-src_orig/pypy/rlib/ropenssl.py pypy-1.5-src/pypy/rlib/ropenssl.py
--- pypy-1.5-src_orig/pypy/rlib/ropenssl.py	2011-04-30 17:18:50.000000000 +0300
+++ pypy-1.5-src/pypy/rlib/ropenssl.py	2011-05-07 16:22:21.387000017 +0300
@@ -98,6 +98,7 @@
 ssl_external('SSL_load_error_strings', [], lltype.Void)
 ssl_external('SSL_library_init', [], rffi.INT)
 if HAVE_OPENSSL_RAND:
+    eci.includes = eci.includes+('openssl/rand.h',);
     ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
     ssl_external('RAND_status', [], rffi.INT)
     ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
diff -ur pypy-1.5-src_orig/pypy/translator/goal/translate.py pypy-1.5-src/pypy/translator/goal/translate.py
--- pypy-1.5-src_orig/pypy/translator/goal/translate.py	2011-04-30 17:18:50.000000000 +0300
+++ pypy-1.5-src/pypy/translator/goal/translate.py	2011-05-06 23:32:58.855999980 +0300
@@ -253,7 +253,6 @@
             log.event("batch mode, not calling interactive helpers")
             return
         
-        log.event("start debugger...")
 
         if translateconfig.view:
             try:
@@ -264,7 +263,6 @@
             page = graphpage.TranslatorPage(t1, translateconfig.huge)
             page.display_background()
 
-        pdb_plus_show.start(tb)
 
     try:
         drv = driver.TranslationDriver.from_targetspec(targetspec_dic, config, args,
diff -ur pypy-1.5-src_orig/pypy/translator/c/gcc/trackgcroot.py pypy-1.5-src/pypy/translator/c/gcc/trackgcroot.py
--- pypy-1.5-src_orig/pypy/translator/c/gcc/trackgcroot.py	2011-05-27 12:41:49.005000002 +0300
+++ pypy-1.5-src/pypy/translator/c/gcc/trackgcroot.py	2011-05-27 12:56:16.292000001 +0300
@@ -1640,6 +1640,7 @@
             }
             """
         elif self.format in ('elf64', 'darwin64'):
+            print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
             print >> output, "\t.text"
             print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
             _variant(elf64='.type pypy_asm_stackwalk, @function',