[Glibc-bsd-commits] r1568 - trunk/web/patches
Petr Salinger
ps-guest at costa.debian.org
Fri May 12 19:01:49 UTC 2006
Author: ps-guest
Date: 2006-05-12 19:01:48 +0000 (Fri, 12 May 2006)
New Revision: 1568
Added:
trunk/web/patches/gcj-4.1_debian.diff
trunk/web/patches/gcj-4.1_kbsd-gnu-java.dpatch
Log:
* java support for GNU/k*BSD for 4.1
debian packaging is dirty, help will be appreciated
Added: trunk/web/patches/gcj-4.1_debian.diff
===================================================================
--- trunk/web/patches/gcj-4.1_debian.diff 2006-05-12 16:31:04 UTC (rev 1567)
+++ trunk/web/patches/gcj-4.1_debian.diff 2006-05-12 19:01:48 UTC (rev 1568)
@@ -0,0 +1,152 @@
+
+Author: petr
+Status: works
+
+ gcj-4.1_kbsd-gnu-java.dpatch is clean, should be put into debian/patches/kbsd-gnu-java.dpatch
+ this file with changes to debian packaging is dirty, help will be appreciated
+
+ packaging have to be adjusted properly, as libgjsmalsa builds only on Linux(libasound2-dev)
+ manipulating with libgjsmalsa should be conditionalized, not deleted
+
+
+Testsuite of 4.1.0-2j:
+
+Native configuration is i486-pc-kfreebsd-gnu
+
+ === libjava tests ===
+
+Running target unix
+FAIL: LargeFile execution - source compiled test
+FAIL: LargeFile execution - gij test
+FAIL: LargeFile execution - bytecode->native test
+FAIL: LargeFile -O3 execution - source compiled test
+FAIL: LargeFile execution - gij test
+FAIL: LargeFile -O3 execution - bytecode->native test
+FAIL: Throw_2 execution - source compiled test
+FAIL: Throw_2 execution - gij test
+FAIL: Throw_2 execution - bytecode->native test
+FAIL: Throw_2 -O3 execution - source compiled test
+FAIL: Throw_2 execution - gij test
+FAIL: Throw_2 -O3 execution - bytecode->native test
+
+ === libjava Summary for unix ===
+
+# of expected passes 4011
+# of unexpected failures 12
+# of expected failures 10
+# of untested testcases 20
+
+*************************************************************************
+
+
+diff -ur std/gcj-4.1-4.1.0/debian/control gcj-4.1-4.1.0/debian/control
+--- std/gcj-4.1-4.1.0/debian/control 2006-05-12 13:27:41.000000000 +0200
++++ gcj-4.1-4.1.0/debian/control 2006-05-12 08:13:53.000000000 +0200
+@@ -4,7 +4,7 @@
+ Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
+ Uploaders: Matthias Klose <doko at debian.org>
+ Standards-Version: 3.6.2
+-Build-Depends: dpkg-dev (>= 1.13.9), libc6.1-dev (>= 2.3.6-7) [alpha ia64] | libc0.3-dev (>= 2.3.6-7) | libc0.1-dev (>= 2.3.6-7) | libc12-dev (>= 2.3.6-7) | libc6-dev (>= 2.3.6-7), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], lib32gcc1 [amd64 ppc64], lib64gcc1 [i386 powerpc sparc s390], lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, automake1.9, libtool, autogen, gawk, dejagnu (>= 1.4.3) [!hurd-i386], expect-tcl8.3 [!hurd-i386], bzip2, binutils (>= 2.16.1cvs20051214) | binutils-multiarch (>= 2.16.1cvs20051214), binutils-hppa64 (>= 2.16.1cvs20051214) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:1.875a-1), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libmpfr-dev [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386], procps [!hurd-i386], sharutils, libasound2-dev [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], lib32asound2-dev [amd64 ppc64], lib64asound2-dev [i386 powerpc sparc s390], libxtst-dev [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], libxt-dev [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], libart-2.0-dev [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], libcairo2-dev [!kfreebsd-i386 !knetbsd-i386 !netbsd-i386], gcc-4.1-source (>= 4.1.0), gcc-4.1-source (<< 4.1.1), realpath (>= 1.9.12), chrpath, lsb-release, dash [hppa]
++Build-Depends: dpkg-dev (>= 1.13.9), libc6.1-dev (>= 2.3.6-7) [alpha ia64] | libc0.3-dev (>= 2.3.6-7) | libc0.1-dev (>= 2.3.6-7) | libc12-dev (>= 2.3.6-7) | libc6-dev (>= 2.3.6-7), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], lib32gcc1 [amd64 ppc64], lib64gcc1 [i386 powerpc sparc s390], lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, automake1.9, libtool, autogen, gawk, dejagnu (>= 1.4.3) [!hurd-i386], expect-tcl8.3 [!hurd-i386], bzip2, binutils (>= 2.16.1cvs20051214) | binutils-multiarch (>= 2.16.1cvs20051214), binutils-hppa64 (>= 2.16.1cvs20051214) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:1.875a-1), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libmpfr-dev [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386], procps [!hurd-i386], sharutils, libasound2-dev [!knetbsd-i386 !netbsd-i386 !kfreebsd-i386 !kfreebsd-amd64], lib32asound2-dev [amd64 ppc64], lib64asound2-dev [i386 powerpc sparc s390], libxtst-dev [!knetbsd-i386 !netbsd-i386], libxt-dev [!knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!knetbsd-i386 !netbsd-i386], libart-2.0-dev [!knetbsd-i386 !netbsd-i386], libcairo2-dev [!knetbsd-i386 !netbsd-i386], gcc-4.1-source (>= 4.1.0), gcc-4.1-source (<< 4.1.1), realpath (>= 1.9.12), chrpath, lsb-release, dash [hppa]
+ Build-Depends-Indep: doxygen (>= 1.4.2), graphviz (>= 2.2), gsfonts-x11, gjdoc
+
+ Package: gcj-4.1-base
+diff -ur std/gcj-4.1-4.1.0/debian/rules.conf gcj-4.1-4.1.0/debian/rules.conf
+--- std/gcj-4.1-4.1.0/debian/rules.conf 2006-05-12 13:27:41.000000000 +0200
++++ gcj-4.1-4.1.0/debian/rules.conf 2006-05-12 08:13:21.000000000 +0200
+@@ -98,7 +98,7 @@
+ LIBC_BUILD_DEP := libc6.1-dev (>= $(libc_ver)) [alpha ia64] | libc0.3-dev (>= $(libc_ver)) | libc0.1-dev (>= $(libc_ver)) | libc12-dev (>= $(libc_ver)) | libc6-dev (>= $(libc_ver))
+
+ ifneq (,$(java_awt_peers))
+- JAVA_BUILD_DEP := libasound2-dev [java_no_archs],
++ JAVA_BUILD_DEP := libasound2-dev [java_no_archs !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ JAVA_BUILD_DEP += lib32asound2-dev [amd64 ppc64], lib64asound2-dev [i386 powerpc sparc s390],
+ ifneq (,$(findstring gtk,$(java_awt_peers)))
+ JAVA_BUILD_DEP += libxtst-dev [java_no_archs], libxt-dev [java_no_archs], libgtk2.0-dev (>= 2.4.4-2) [java_no_archs], libart-2.0-dev [java_no_archs], libcairo2-dev [java_no_archs],
+@@ -366,7 +366,7 @@
+ ada_no_archs := $(strip $(foreach cpu,$(ada_no_cpus),!$(cpu)) \
+ !knetbsd-i386 !netbsd-i386 !hurd-i386)
+ java_no_archs := $(strip $(foreach cpu,$(java_no_cpus),!$(cpu)) \
+- !kfreebsd-i386 !knetbsd-i386 !netbsd-i386)
++ !knetbsd-i386 !netbsd-i386)
+ pascal_no_archs := $(strip $(foreach cpu,$(pascal_no_cpus),!$(cpu)) \
+ !netbsd-i386)
+ fortran_no_archs:= $(strip $(foreach cpu,$(fortran_no_cpus),!$(cpu)) \
+diff -ur std/gcj-4.1-4.1.0/debian/rules.d/binary-java.mk gcj-4.1-4.1.0/debian/rules.d/binary-java.mk
+--- std/gcj-4.1-4.1.0/debian/rules.d/binary-java.mk 2006-05-12 13:27:41.000000000 +0200
++++ gcj-4.1-4.1.0/debian/rules.d/binary-java.mk 2006-05-12 07:48:47.000000000 +0200
+@@ -98,7 +98,6 @@
+ $(PF)/$(libdir)
+
+ files_jlib = \
+- $(PF)/$(libdir)/libgjsmalsa.so.* \
+ $(PF)/$(libdir)/libgij.so.* \
+ $(PF)/$(libdir)/libgcj.so.*
+
+@@ -129,7 +128,6 @@
+ $(PF)/$(libdir)/libgcj*.{a,la} \
+ $(PF)/$(libdir)/{libgcj*.so,libgcj.spec} \
+ $(PF)/$(libdir)/pkgconfig/libgcj.pc \
+- $(PF)/$(libdir)/libgjsmalsa.{la,so} \
+ $(PF)/$(libdir)/lib-gnu-*.{a,la} \
+ $(PF)/$(libdir)/lib-gnu-*.so
+
+@@ -352,8 +350,6 @@
+ dh_installdirs -p$(p_jlib) $(dirs_jlib)
+ dh_installdirs -p$(p_jlibx) $(dirs_jlibx)
+
+- mv debian/tmp/$(PF)/$(libdir)/classpath/libgjsmalsa.* \
+- debian/tmp/$(PF)/$(libdir)/
+
+ DH_COMPAT=2 dh_movefiles -p$(p_gij) $(files_gij)
+ DH_COMPAT=2 dh_movefiles -p$(p_jlib) $(files_jlib)
+@@ -362,8 +358,6 @@
+ cp -p debian/tmp/$(PF)/$(libdir)/libgcjawt.la \
+ debian/tmp/$(PF)/$(libdir)/lib-gnu-java-awt*.la \
+ $(d_jlibx)/$(PF)/$(libdir)/gcj$(pkg_ver)/
+- cp -p debian/tmp/$(PF)/$(libdir)/libgjsmalsa.la \
+- $(d_jlib)/$(PF)/$(libdir)/gcj$(pkg_ver)/
+
+ cp -p $(srcdir)/libjava/{NEWS,README,THANKS} \
+ $(d_jlib)/usr/share/doc/$(p_jbase)/
+@@ -537,8 +531,6 @@
+ ln -sf $$i.so.$(GCJ_SONAME).0.0 \
+ $(d_jdbg)/usr/lib/debug/usr/lib/$$i.so.$(GCJ_SONAME); \
+ done
+- ln -sf libgjsmalsa.so.0.0.0 \
+- $(d_jdbg)/usr/lib/debug/usr/lib/libgjsmalsa.so.0
+
+ dh_compress -p$(p_jdbg)
+ dh_fixperms -p$(p_jdbg)
+@@ -588,8 +580,6 @@
+ ln -sf $$i.so.$(GCJ_SONAME).0.0 \
+ $(d_j32dbg)/usr/lib/debug/$(lib32)/$$i.so.$(GCJ_SONAME); \
+ done
+- ln -sf libgjsmalsa.so.0.0.0 \
+- $(d_j32dbg)/usr/lib/debug/$(lib32)/libgjsmalsa.so.0
+
+ debian/dh_rmemptydirs -p$(p_j32lib)
+ debian/dh_rmemptydirs -p$(p_j32dev)
+diff -ur std/gcj-4.1-4.1.0/debian/rules.defs gcj-4.1-4.1.0/debian/rules.defs
+--- std/gcj-4.1-4.1.0/debian/rules.defs 2006-05-12 13:27:41.000000000 +0200
++++ gcj-4.1-4.1.0/debian/rules.defs 2006-05-11 19:48:50.000000000 +0200
+@@ -267,7 +267,7 @@
+ endif
+
+ java_no_cpus := #mips mipsel
+-java_no_systems := hurd-i386 kfreebsd-gnu knetbsd-gnu netbsdelf-gnu
++java_no_systems := hurd-i386 knetbsd-gnu netbsdelf-gnu
+ ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(java_no_cpus)))
+ with_java := disabled for architecture $(DEB_TARGET_ARCH_CPU)
+ endif
+diff -ur std/gcj-4.1-4.1.0/debian/rules.patch gcj-4.1-4.1.0/debian/rules.patch
+--- std/gcj-4.1-4.1.0/debian/rules.patch 2006-05-12 13:27:41.000000000 +0200
++++ gcj-4.1-4.1.0/debian/rules.patch 2006-05-12 15:15:33.000000000 +0200
+@@ -87,6 +87,7 @@
+
+ ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
+ debian_patches += kbsd-gnu-ada
++ debian_patches += kbsd-gnu-java
+ endif
+ ifeq ($(DEB_TARGET_ARCH_OS),knetbsd)
+ debian_patches += # kbsd-gnu
Added: trunk/web/patches/gcj-4.1_kbsd-gnu-java.dpatch
===================================================================
--- trunk/web/patches/gcj-4.1_kbsd-gnu-java.dpatch 2006-05-12 16:31:04 UTC (rev 1567)
+++ trunk/web/patches/gcj-4.1_kbsd-gnu-java.dpatch 2006-05-12 19:01:48 UTC (rev 1568)
@@ -0,0 +1,292 @@
+#! /bin/sh -e
+
+# Description: java support for GNU/k*BSD
+# Author: Robert Millan, Petr Salinger
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+ pdir="-d $3"
+ dir="$3/"
+elif [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $pdir -f --no-backup-if-mismatch -p2 < $0
+ ;;
+ -unpatch)
+ patch $pdir -f --no-backup-if-mismatch -R -p2 < $0
+ ;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/configure gcj-4.1-4.1.0/src/boehm-gc/configure
+--- gcj-4.1-4.1.0/src/boehm-gc/configure 2006-02-28 09:39:11.000000000 +0100
++++ gcj-4.1-4.1.0/src/boehm-gc/configure 2006-05-12 08:34:57.000000000 +0200
+@@ -5434,6 +5423,32 @@
+
+ THREADLIBS="-lpthread -lrt"
+ ;;
++ *-*-kfreebsd*-gnu)
++ cat >>confdefs.h <<\_ACEOF
++#define GC_FREEBSD_THREADS 1
++_ACEOF
++
++ INCLUDES="$INCLUDES -pthread"
++ THREADDLLIBS=-pthread
++ cat >>confdefs.h <<\_ACEOF
++#define _REENTRANT 1
++_ACEOF
++
++ if test "${enable_parallel_mark}" = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define PARALLEL_MARK 1
++_ACEOF
++
++ fi
++ cat >>confdefs.h <<\_ACEOF
++#define THREAD_LOCAL_ALLOC 1
++_ACEOF
++
++ cat >>confdefs.h <<\_ACEOF
++#define USE_COMPILER_TLS 1
++_ACEOF
++
++ ;;
+ *-*-freebsd*)
+ { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
+ echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/configure.ac gcj-4.1-4.1.0/src/boehm-gc/configure.ac
+--- gcj-4.1-4.1.0/src/boehm-gc/configure.ac 2006-02-07 02:05:55.000000000 +0100
++++ gcj-4.1-4.1.0/src/boehm-gc/configure.ac 2006-05-12 08:35:43.000000000 +0200
+@@ -150,6 +150,17 @@
+ AC_DEFINE(THREAD_LOCAL_ALLOC,1)
+ THREADLIBS="-lpthread -lrt"
+ ;;
++ *-*-kfreebsd*-gnu)
++ AC_DEFINE(GC_FREEBSD_THREADS)
++ INCLUDES="$INCLUDES -pthread"
++ THREADDLLIBS=-pthread
++ AC_DEFINE(_REENTRANT)
++ if test "${enable_parallel_mark}" = yes; then
++ AC_DEFINE(PARALLEL_MARK)
++ fi
++ AC_DEFINE(THREAD_LOCAL_ALLOC)
++ AC_DEFINE(USE_COMPILER_TLS, 1,[use tls for boehm])
++ ;;
+ *-*-freebsd*)
+ AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
+ AC_DEFINE(GC_FREEBSD_THREADS,1,[support FreeBSD threads])
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c
+--- gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c 2005-02-26 16:40:07.000000000 +0100
++++ gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c 2006-05-12 08:33:17.000000000 +0200
+@@ -26,7 +26,7 @@
+ * None of this is safe with dlclose and incremental collection.
+ * But then not much of anything is safe in the presence of dlclose.
+ */
+-#if defined(__linux__) && !defined(_GNU_SOURCE)
++#if (defined(__linux__) || defined(__GLIBC__)) && !defined(_GNU_SOURCE)
+ /* Can't test LINUX, since this must be define before other includes */
+ # define _GNU_SOURCE
+ #endif
+@@ -373,7 +373,7 @@
+ /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
+ /* versions. Thanks to Jakub Jelinek for most of the code. */
+
+-# if defined(LINUX) /* Are others OK here, too? */ \
++# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
+ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/gc.h gcj-4.1-4.1.0/src/boehm-gc/include/gc.h
+--- gcj-4.1-4.1.0/src/boehm-gc/include/gc.h 2005-01-02 04:35:57.000000000 +0100
++++ gcj-4.1-4.1.0/src/boehm-gc/include/gc.h 2006-05-12 08:33:17.000000000 +0200
+@@ -497,7 +497,7 @@
+ # define GC_RETURN_ADDR (GC_word)__return_address
+ #endif
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+ && !defined(__ia64__)
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in
+--- gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in 2006-02-07 02:05:55.000000000 +0100
++++ gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in 2006-05-12 08:35:50.000000000 +0200
+@@ -148,6 +148,9 @@
+ /* define GC_local_malloc() & GC_local_malloc_atomic() */
+ #undef THREAD_LOCAL_ALLOC
+
++/* use tls for boehm */
++#undef USE_COMPILER_TLS
++
+ /* use MMAP instead of sbrk to get new memory */
+ #undef USE_MMAP
+
+diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h
+--- gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h 2005-09-06 16:22:01.000000000 +0200
++++ gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h 2006-05-12 08:34:42.000000000 +0200
+@@ -55,7 +55,7 @@
+ # endif
+
+ /* And one for FreeBSD: */
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # define FREEBSD
+ # endif
+
+@@ -1223,8 +1223,15 @@
+ # ifndef GC_FREEBSD_THREADS
+ # define MPROTECT_VDB
+ # endif
+-# define SIG_SUSPEND SIGUSR1
+-# define SIG_THR_RESTART SIGUSR2
++# ifdef __GLIBC__
++# define SIG_SUSPEND (32+6)
++# define SIG_THR_RESTART (32+5)
++ extern int _end[];
++# define DATAEND (_end)
++# else
++# define SIG_SUSPEND SIGUSR1
++# define SIG_THR_RESTART SIGUSR2
++# endif
+ # define FREEBSD_STACKBOTTOM
+ # ifdef __ELF__
+ # define DYNAMIC_LOADING
+@@ -1923,6 +1930,28 @@
+ # define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
+ # endif
+ # endif
++# ifdef FREEBSD
++# define OS_TYPE "FREEBSD"
++# ifndef GC_FREEBSD_THREADS
++# define MPROTECT_VDB
++# endif
++# ifdef __GLIBC__
++# define SIG_SUSPEND (32+6)
++# define SIG_THR_RESTART (32+5)
++ extern int _end[];
++# define DATAEND (_end)
++# else
++# define SIG_SUSPEND SIGUSR1
++# define SIG_THR_RESTART SIGUSR2
++# endif
++# define FREEBSD_STACKBOTTOM
++# ifdef __ELF__
++# define DYNAMIC_LOADING
++# endif
++ extern char etext[];
++ extern char * GC_FreeBSDGetDataStart();
++# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
++# endif
+ # ifdef NETBSD
+ # define OS_TYPE "NETBSD"
+ # ifdef __ELF__
+@@ -1994,7 +2023,7 @@
+ # define SUNOS5SIGS
+ # endif
+
+-# if defined(FREEBSD) && (__FreeBSD__ >= 4)
++# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
+ # define SUNOS5SIGS
+ # endif
+
+@@ -2057,7 +2086,7 @@
+ # define CACHE_LINE_SIZE 32 /* Wild guess */
+ # endif
+
+-# ifdef LINUX
++# if defined(LINUX) || defined(__GLIBC__)
+ # define REGISTER_LIBRARIES_EARLY
+ /* We sometimes use dl_iterate_phdr, which may acquire an internal */
+ /* lock. This isn't safe after the world has stopped. So we must */
+@@ -2137,7 +2166,7 @@
+ #if defined(SPARC)
+ # define CAN_SAVE_CALL_ARGS
+ #endif
+-#if (defined(I386) || defined(X86_64)) && defined(LINUX)
++#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
+ /* SAVE_CALL_CHAIN is supported if the code is compiled to save */
+ /* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
+ # define CAN_SAVE_CALL_ARGS
+diff -ur gcj-4.1-4.1.0/src/libjava/configure gcj-4.1-4.1.0/src/libjava/configure
+--- gcj-4.1-4.1.0/src/libjava/configure 2006-05-12 13:35:06.000000000 +0200
++++ gcj-4.1-4.1.0/src/libjava/configure 2006-05-12 11:00:31.000000000 +0200
+@@ -4351,7 +4341,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+diff -ur gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4
+--- gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 2006-05-12 13:35:07.000000000 +0200
++++ gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 2006-05-12 11:07:03.000000000 +0200
+@@ -1413,7 +1413,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+diff -ur gcj-4.1-4.1.0/src/libjava/libltdl/configure gcj-4.1-4.1.0/src/libjava/libltdl/configure
+--- gcj-4.1-4.1.0/src/libjava/libltdl/configure 2006-05-12 13:35:21.000000000 +0200
++++ gcj-4.1-4.1.0/src/libjava/libltdl/configure 2006-05-12 11:07:15.000000000 +0200
+@@ -8380,7 +8380,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -12021,7 +12021,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15097,7 +15097,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -17380,7 +17380,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+diff -ur gcj-4.1-4.1.0/src/libjava/shlibpath.m4 gcj-4.1-4.1.0/src/libjava/shlibpath.m4
+--- gcj-4.1-4.1.0/src/libjava/shlibpath.m4 2006-01-07 19:14:24.000000000 +0100
++++ gcj-4.1-4.1.0/src/libjava/shlibpath.m4 2006-05-12 08:36:28.000000000 +0200
+@@ -361,7 +361,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux*|k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
Property changes on: trunk/web/patches/gcj-4.1_kbsd-gnu-java.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Glibc-bsd-commits
mailing list