[packages/guile1: 113/172] - merged fixes for ppc64 and amd64 (which really differs from ia64) - just in case, normally __libc_

jajcus jajcus at pld-linux.org
Sat Dec 12 13:48:17 CET 2015


commit 3ff455da04917eace7fd3680b1dea6bb49f11cbc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Nov 2 00:09:25 2004 +0000

    - merged fixes for ppc64 and amd64 (which really differs from ia64) - just in case, normally __libc_stack_end is used instead of this whole code
    
    Changed files:
        guile-unknown_arch.patch -> 1.2

 guile-unknown_arch.patch | 69 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 11 deletions(-)
---
diff --git a/guile-unknown_arch.patch b/guile-unknown_arch.patch
index 941131c..00281ab 100644
--- a/guile-unknown_arch.patch
+++ b/guile-unknown_arch.patch
@@ -1,16 +1,63 @@
---- guile-1.6.0/libguile/gc_os_dep.c.unknown_arch	2002-07-08 11:09:32.000000000 -0400
-+++ guile-1.6.0/libguile/gc_os_dep.c	2002-12-05 08:58:12.000000000 -0500
-@@ -195,11 +195,11 @@
- #    define I386
+--- guile-1.6.5/libguile/gc_os_dep.c.orig	2004-06-16 00:55:31.000000000 +0200
++++ guile-1.6.5/libguile/gc_os_dep.c	2004-11-01 23:45:31.105332992 +0100
+@@ -227,6 +227,10 @@
+ #    define POWERPC
  #    define mach_type_known
  # endif
--# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
-+# if defined(LINUX) && (defined(__ia64__) || defined(__ia64)) || defined(__x86_64__)
- #    define IA64
++# if defined(LINUX) && defined(__powerpc64__)
++#    define POWERPC64
++#    define mach_type_known
++# endif
+ # if defined(LINUX) && defined(__mc68000__)
+ #    define M68K
  #    define mach_type_known
- # endif
--# if defined(LINUX) && defined(powerpc)
-+# if defined(LINUX) && defined(powerpc) || defined(__s390__)
- #    define POWERPC
+@@ -371,6 +375,10 @@
+ #    define S370
  #    define mach_type_known
  # endif
++# if defined(__x86_64__) && defined(LINUX)
++#    define AMD64
++#    define mach_type_known
++# endif
+ # if defined(__GNU__)
+ #    define I386
+ #    define GNU
+@@ -631,6 +639,19 @@
+ #   endif
+ # endif
+ 
++# ifdef POWERPC64
++#   define MACH_TYPE "POWERPC64"
++#   define ALIGNMENT 8
++#   define CPP_WORDSZ 64
++#   define HEURISTIC1
++#   define DYNAMIC_LOADING
++#   undef STACK_GRAN
++#   define STACK_GRAN 0x10000000
++#   define LINUX_DATA_START
++    extern int _end;
++#   define DATAEND (&_end)
++# endif
++
+ # ifdef POWERPC
+ #   define MACH_TYPE "POWERPC"
+ #   ifdef MACOS
+@@ -1146,6 +1167,18 @@
+ #   endif
+ # endif
+ 
++# ifdef AMD64
++#   define MACH_TYPE "AMD64"
++#   define OS_TYPE "LINUX"
++#   define ALIGNMENT 8
++#   define CPP_WORDSZ 64
++#   define DYNAMIC_LOADING
++#   define LINUX_DATA_START
++extern int _end;
++#   define DATAEND (&_end)
++#   define STACKBOTTOM ((ptr_t) 0x7fc0000000l)
++# endif
++
+ # ifdef IA64
+ #   define MACH_TYPE "IA64"
+ #   define ALIGN_DOUBLE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guile1.git/commitdiff/ebe6c26bec9cbe3813afc2be58f989889f8e944a



More information about the pld-cvs-commit mailing list