--- pypy-pypy-release-1.7/pypy/translator/goal/translate.py.bak	2011-11-29 14:23:55.000000000 +0100
+++ pypy-pypy-release-1.7/pypy/translator/goal/translate.py	2011-11-29 14:24:16.000000000 +0100
@@ -255,8 +255,6 @@
             log.event("batch mode, not calling interactive helpers")
             return
         
-        log.event("start debugger...")
-
         if translateconfig.view:
             try:
                 t1 = drv.hint_translator
@@ -266,8 +264,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,
                                                        empty_translator=t,
--- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak	2011-11-29 14:22:29.000000000 +0100
+++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py	2011-11-29 14:22:55.000000000 +0100
@@ -1694,6 +1694,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',
--- pypy-pypy-release-1.7/pypy/rlib/ropenssl.py.bak	2011-11-29 14:19:10.000000000 +0100
+++ pypy-pypy-release-1.7/pypy/rlib/ropenssl.py	2011-11-29 14:19:42.000000000 +0100
@@ -159,6 +159,7 @@
              lltype.Void)
 
 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)