Merge branch 'stable-3.2'

bonzini · Aug 10, 2012 · e7327f0 · e7327f0
2 parents 3433ecb + 1cccee3
commit e7327f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* kernel/CallinProcess.st: Fix creation of cloned process, reported
+	by Holger Freyther.
+
 2012-02-22  Gwenael Casaccio  <mrgwen@gmail.com>
             Paolo Bonzini  <bonzini@gnu.org>
 

diff --git a/configure.ac b/configure.ac
@@ -726,8 +726,8 @@ if test "$enable_shared" != no; then
       # For Windows, the shared library will be installed in bindir anyway
       ;;
 
-    *-linux*)
-      # For Linux, we can use a relative rpath via -Wl,-rpath,...
+    *-gnu*)
+      # For glibc, we can use a relative rpath via -Wl,-rpath,...
       case "$acl_final_libdir" in
         "${acl_final_exec_prefix}"/*) ;;
         /*) relocatable_reason='no, libdir outside exec-prefix' ;;

diff --git a/kernel/CallinProcess.st b/kernel/CallinProcess.st
@@ -63,10 +63,12 @@ invoked me no longer exist).  I am otherwise equivalent to a Process.'>
                 reason: 'process not active' ].
 
         p := Process basicNew.
-        Link instSize + 1 to: Process instSize do: [ :i |
+        "Skip suspendedContext, priority, myList"
+        Link instSize + 4 to: Process instSize do: [ :i |
             p instVarAt: i put: (self instVarAt: i) ].
 
         "Start executing the detached process from here."
+        p priority: self priority.
         p suspendedContext: thisContext copy.
 
         Processor activeProcess == self ifTrue: [