[pkg-java] r4303 - in trunk/kaffe/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Wed Oct 3 21:34:00 UTC 2007
Author: mkoch
Date: 2007-10-03 21:34:00 +0000 (Wed, 03 Oct 2007)
New Revision: 4303
Added:
trunk/kaffe/debian/compat
Removed:
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch
trunk/kaffe/debian/patches/05_gcc4.1_x86.patch
trunk/kaffe/debian/patches/06_atomic_ia64.patch
Modified:
trunk/kaffe/debian/
trunk/kaffe/debian/FileActions
trunk/kaffe/debian/changelog
trunk/kaffe/debian/control
trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
trunk/kaffe/debian/rules
Log:
kaffe (2:1.1.8-1) unstable; urgency=low
* New upstream release
- obsoleted debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch.
- obsoleted debian/patches/02_IncludeEcjCompilerInToolsJar.patch,
- obsoleted debian/patches/04_gcc4.1_amd64.patch.
- obsoleted debian/patches/05_gcc4.1_x86.patch.
- obsoleted debian/patches/06_atomic_ia64.patch.
* Use debian/compat instead of DH_COMPAT. Increased level to 5. Updated
Build-Depends on debhelper.
* Replaced ${Source-Version} in debian/control. Fixes binNMU-ability.
Closes: #433906.
* Removed duplicated build-dependency on libasound2-dev, replaced
ecj-bootstrap by ecj and ecj-bootstrap-gcj by ecj-gcj.
* Removed x-dev from Build-Depends.
* Put kaffe-doc into doc section.
* Removed Wolfgang from Uploaders.
-- Michael Koch <konqueror at gmx.de> Sun, 16 Sep 2007 00:13:08 +0200
Property changes on: trunk/kaffe/debian
___________________________________________________________________
Name: svn:ignore
- jikes-kaffe
kaffe
kaffe-common
kaffe-dev
kaffe-doc
kaffe-jthreads
kaffe-pthreads
files
install
kaffe-jthreads.postinst
kaffe-jthreads.prerm
kaffe-jthreads.substvars
kaffe-pthreads.postinst
kaffe-pthreads.prerm
kaffe-pthreads.substvars
+ installfakeinstall
jikes-kaffe
kaffe
kaffe-common
kaffe-dev
kaffe-doc
kaffe-jthreads
kaffe-pthreads
files
install
kaffe-jthreads.postinst
kaffe-jthreads.prerm
kaffe-jthreads.substvars
kaffe-pthreads.postinst
kaffe-pthreads.prerm
kaffe-pthreads.substvars
Modified: trunk/kaffe/debian/FileActions
===================================================================
--- trunk/kaffe/debian/FileActions 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/FileActions 2007-10-03 21:34:00 UTC (rev 4303)
@@ -26,11 +26,11 @@
Target: usr/share/kaffe-common/lib
Action: link
-File: usr/lib/kaffe/jthreads/lib/{tools.jar}
+File: usr/lib/kaffe/jthreads/lib/{kaffe-classpath-tools.jar}
Target: usr/share/kaffe-common/lib
Action: move-link
-File: usr/lib/kaffe/pthreads/lib/{tools.jar}
+File: usr/lib/kaffe/pthreads/lib/{kaffe-classpath-tools.jar}
Target: usr/share/kaffe-common/lib
Action: link
Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/changelog 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,3 +1,23 @@
+kaffe (2:1.1.8-1) unstable; urgency=low
+
+ * New upstream release
+ - obsoleted debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch.
+ - obsoleted debian/patches/02_IncludeEcjCompilerInToolsJar.patch,
+ - obsoleted debian/patches/04_gcc4.1_amd64.patch.
+ - obsoleted debian/patches/05_gcc4.1_x86.patch.
+ - obsoleted debian/patches/06_atomic_ia64.patch.
+ * Use debian/compat instead of DH_COMPAT. Increased level to 5. Updated
+ Build-Depends on debhelper.
+ * Replaced ${Source-Version} in debian/control. Fixes binNMU-ability.
+ Closes: #433906.
+ * Removed duplicated build-dependency on libasound2-dev, replaced
+ ecj-bootstrap by ecj and ecj-bootstrap-gcj by ecj-gcj.
+ * Removed x-dev from Build-Depends.
+ * Put kaffe-doc into doc section.
+ * Removed Wolfgang from Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 16 Sep 2007 00:13:08 +0200
+
kaffe (2:1.1.7-4) unstable; urgency=low
* Use default gcc again for ia64
Added: trunk/kaffe/debian/compat
===================================================================
--- trunk/kaffe/debian/compat (rev 0)
+++ trunk/kaffe/debian/compat 2007-10-03 21:34:00 UTC (rev 4303)
@@ -0,0 +1 @@
+5
Modified: trunk/kaffe/debian/control
===================================================================
--- trunk/kaffe/debian/control 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/control 2007-10-03 21:34:00 UTC (rev 4303)
@@ -2,13 +2,13 @@
Section: interpreters
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.1), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, fastjar, ecj-bootstrap (>= 3.1.2-4), ecj-bootstrap-gcj (>= 3.1.2-4) [alpha arm hppa i386 ia64 powerpc s390 sparc], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, x-dev, libice-dev, libxt-dev, libasound2-dev
+Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
+Build-Depends: debhelper (>= 5), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, fastjar, ecj (>= 3.3), ecj-gcj (>= 3.3) [alpha arm hppa i386 ia64 powerpc s390 sparc], gij-4.2, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libice-dev, libxt-dev, libgconf2-dev
Standards-Version: 3.7.2
Package: kaffe
Architecture: all
-Depends: kaffe-pthreads (= ${Source-Version}) | kaffe-jthreads (= ${Source-Version})
+Depends: kaffe-pthreads (>= ${source:Version}) | kaffe-jthreads (>= ${source:Version})
Conflicts: kaffe-pthreads-profile
Replaces: kaffe-pthreads-profile
Description: A JVM to run Java bytecode
@@ -24,8 +24,8 @@
Package: kaffe-jthreads
Architecture: any
-Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, ecj-bootstrap, gjdoc, fastjar
+Pre-Depends: kaffe-common (= ${source:Version})
+Depends: ${shlibs:Depends}, libecj-java, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A green threads enabled version of the Kaffe VM
Green threads enabled compiler for the Kaffe VM for situations where native
@@ -33,8 +33,8 @@
Package: kaffe-pthreads
Architecture: any
-Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, ecj-bootstrap, gjdoc, fastjar
+Pre-Depends: kaffe-common (= ${source:Version})
+Depends: ${shlibs:Depends}, libecj-java, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A POSIX threads enabled version of the Kaffe VM
This will allow your multithreaded Java programs take advantage of native
@@ -50,14 +50,14 @@
Package: kaffe-dev
Architecture: all
-Depends: kaffe (= ${Source-Version})
+Depends: kaffe (= ${source:Version})
Description: Header files and other resources for building against Kaffe
Header and other files needed for compiling native JNI extensions to the
Kaffe Virtual Machine.
Package: jikes-kaffe
Architecture: all
-Depends: jikes, kaffe-common (= ${Source-Version})
+Depends: jikes, kaffe-common (= ${source:Version})
Provides: java-compiler
Description: Wrapper for jikes using Kaffe classes
This package provides a jikes wrapper called jikes-kaffe that will include
@@ -65,6 +65,7 @@
Package: kaffe-doc
Architecture: all
+Section: doc
Description: Documentation for the Kaffe VM
Documentation for the Kaffe Virtual Machine including FAQs, READMEs and
other materials.
Modified: trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
===================================================================
--- trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,5 +1,5 @@
---- kaffe-1.1.7/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java.orig 2005-10-19 22:15:26.000000000 +0200
-+++ kaffe-1.1.7/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java 2005-12-09 10:04:26.000000000 +0100
+--- kaffe-1.1.8/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java.orig 2005-10-19 22:15:26.000000000 +0200
++++ kaffe-1.1.8/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java 2005-12-09 10:04:26.000000000 +0100
@@ -111,11 +111,6 @@
properties.setProperty("java.runtime.name", properties.getProperty("java.vm.name"));
properties.setProperty("java.runtime.version", properties.getProperty("java.vm.version"));
Deleted: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,108 +0,0 @@
---- /dev/null 2005-12-09 08:19:17.504520000 +0100
-+++ kaffe-1.1.7/tools/javatools/javalib/com/sun/tools/javac/Main.java 2005-12-09 10:06:43.000000000 +0100
-@@ -0,0 +1,105 @@
-+/* Main.java -- implement com.sun.tools.javac.Main
-+ Copyright (C) 2004 Red Hat
-+
-+This file is part of java-gcj-compat.
-+
-+java-gcj-compat is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+java-gcj-compat is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with java-gcj-compat; see the file COPYING. If not, write to the
-+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+02111-1307 USA.
-+
-+Linking this library statically or dynamically with other modules is
-+making a combined work based on this library. Thus, the terms and
-+conditions of the GNU General Public License cover the whole
-+combination.
-+
-+As a special exception, the copyright holders of this library give you
-+permission to link this library with independent modules to produce an
-+executable, regardless of the license terms of these independent
-+modules, and to copy and distribute the resulting executable under
-+terms of your choice, provided that you also meet, for each linked
-+independent module, the terms and conditions of the license of that
-+module. An independent module is a module which is not derived from
-+or based on this library. If you modify this library, you may extend
-+this exception to your version of the library, but you are not
-+obligated to do so. If you do not wish to do so, delete this
-+exception statement from your version. */
-+
-+package com.sun.tools.javac;
-+
-+import java.io.*;
-+import java.net.*;
-+import java.lang.reflect.*;
-+
-+public class Main
-+{
-+ Constructor ecjConstructor = null;
-+ Method ecjMethod = null;
-+
-+ public Main () throws Exception
-+ {
-+ String classname = "org.eclipse.jdt.internal.compiler.batch.Main";
-+ Class klass = null;
-+ try
-+ {
-+ klass = Class.forName (classname);
-+ }
-+ catch (ClassNotFoundException e)
-+ {
-+ File jar = new File ("/usr/share/java/eclipse-ecj.jar");
-+ if (!jar.exists () || !jar.canRead ())
-+ jar = new File ("/usr/share/java/ecj.jar");
-+ if (!jar.exists () || !jar.canRead ())
-+ throw e;
-+
-+ ClassLoader loader = new URLClassLoader(new URL[] {jar.toURL ()});
-+ try
-+ {
-+ klass = loader.loadClass (classname);
-+ }
-+ catch (ClassNotFoundException f)
-+ {
-+ throw e;
-+ }
-+ }
-+
-+ ecjConstructor = klass.getConstructor (new Class[] {
-+ PrintWriter.class, PrintWriter.class, Boolean.TYPE});
-+ ecjMethod = klass.getMethod ("compile", new Class[] {String[].class});
-+ }
-+
-+ public int compile (String[] args) throws Exception
-+ {
-+ /*
-+ * This code depends on the patch in Comment #10 in this bug
-+ * report:
-+ *
-+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
-+ */
-+ Object ecjInstance = ecjConstructor.newInstance (new Object[] {
-+ new PrintWriter (System.out),
-+ new PrintWriter (System.err),
-+ Boolean.FALSE});
-+ return ((Boolean) ecjMethod.invoke (ecjInstance, new Object[] {
-+ args})).booleanValue() ? 0 : -1;
-+ }
-+
-+ public static void main (String[] args) throws Exception
-+ {
-+ Main javac = new Main ();
-+
-+ int result = javac.compile (args);
-+
-+ Runtime.getRuntime ().exit (result);
-+ }
-+}
Deleted: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,57 +0,0 @@
---- kaffe-1.1.7/tools/javatools/javalib/Makefile.am.orig 2006-02-08 02:13:02.000000000 +0100
-+++ kaffe-1.1.7/tools/javatools/javalib/Makefile.am 2006-04-03 10:46:17.000000000 +0200
-@@ -8,11 +8,12 @@
- # of this file.
-
- CLASSFILE = tools.jar
--SRCDIRS = gnu
-+SRCDIRS = gnu com
-
- toolslib_DATA = $(CLASSFILE)
-
- tools_jar_SRCS = \
-+ com/sun/tools/javac/Main.java \
- gnu/classpath/tools/Util.java \
- gnu/classpath/tools/javap/GnuByteCodeJavap.java \
- gnu/classpath/tools/javap/Javap.java \
-@@ -29,7 +30,7 @@
- EXTRA_DIST = \
- $(tools_jar_SRCS)
-
--JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) $(SRCDIRS))
-+JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) gnu; $(FASTJAR) uf $(CURDIR)/$@.new -C $(LIBDIR) com)
-
- LIBDIR = lib
-
---- kaffe-1.1.7/tools/javatools/javalib/Makefile.in.orig 2006-03-27 02:43:14.000000000 +0200
-+++ kaffe-1.1.7/tools/javatools/javalib/Makefile.in 2006-04-03 11:10:27.000000000 +0200
-@@ -358,9 +358,10 @@
- toolslibdir = @toolslibdir@
- with_engine = @with_engine@
- CLASSFILE = tools.jar
--SRCDIRS = gnu
-+SRCDIRS = gnu com
- toolslib_DATA = $(CLASSFILE)
- tools_jar_SRCS = \
-+ com/sun/tools/javac/Main.java \
- gnu/classpath/tools/Util.java \
- gnu/classpath/tools/javap/GnuByteCodeJavap.java \
- gnu/classpath/tools/javap/Javap.java \
-@@ -374,7 +375,7 @@
- EXTRA_DIST = \
- $(tools_jar_SRCS)
-
--JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) $(SRCDIRS))
-+JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) gnu; $(FASTJAR) uf $(CURDIR)/$@.new -C $(LIBDIR) com)
- LIBDIR = lib
- rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
- real_builddir = $(shell cd $(top_builddir) && pwd )
-@@ -446,7 +447,7 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
-+ $(mkdir_p) $(distdir)/com/sun/tools/javac $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
Modified: trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
===================================================================
--- trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,4 +1,4 @@
--- /dev/null 2005-10-02 10:30:59.122810144 +0200
-+++ kaffe-1.1.7/libraries/javalib/external/classpath/resource/META-INF/services/java.nio.charset.spi.CharsetProvider 2005-10-02 19:24:06.000000000 +0200
++++ kaffe-1.1.8/libraries/javalib/external/classpath/resource/META-INF/services/java.nio.charset.spi.CharsetProvider 2005-10-02 19:24:06.000000000 +0200
@@ -0,0 +1 @@
+gnu.java.nio.charset.iconv.IconvProvider
Deleted: trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch
===================================================================
--- trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,24 +0,0 @@
-diff -ur kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-jthreads/signal.c kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-jthreads/signal.c
---- kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-jthreads/signal.c 2006-08-01 10:28:59.297864000 -0500
-+++ kaffe-1.1.7/kaffe/kaffevm/systems/unix-jthreads/signal.c 2006-08-01 10:38:27.705512000 -0500
-@@ -450,7 +450,7 @@
- void
- detectStackBoundaries(jthread_t jtid, int mainThreadStackSize)
- {
-- static volatile char *guessPointer;
-+ static volatile char * volatile guessPointer;
- void *old_sigsegv, *old_sigbus;
-
- setupSigAltStack();
-diff -ur kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-pthreads/signal.c kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-pthreads/signal.c
---- kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-pthreads/signal.c 2006-08-01 10:28:59.460826000 -0500
-+++ kaffe-1.1.7/kaffe/kaffevm/systems/unix-pthreads/signal.c 2006-08-01 10:38:46.455147000 -0500
-@@ -444,7 +444,7 @@
- void
- detectStackBoundaries(jthread_t jtid, size_t mainThreadStackSize)
- {
-- static volatile char *guessPointer;
-+ static volatile char * volatile guessPointer;
- void *handler_segv, *handler_bus;
-
- #if defined(SIGSEGV)
Deleted: trunk/kaffe/debian/patches/05_gcc4.1_x86.patch
===================================================================
--- trunk/kaffe/debian/patches/05_gcc4.1_x86.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/05_gcc4.1_x86.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,418 +0,0 @@
-diff -ur kaffe-1.1.7/config/i386/jit.h kaffe-1.1.7-autotooled/config/i386/jit.h
---- kaffe-1.1.7/config/i386/jit.h 2006-03-23 15:03:35.000000000 -0600
-+++ kaffe-1.1.7-autotooled/config/i386/jit.h 2006-08-01 09:20:36.950700000 -0500
-@@ -41,7 +41,11 @@
-
- /* Get the first exception frame from a subroutine call */
- #define FIRSTFRAME(f, o) \
-- ((f) = *(exceptionFrame*)__builtin_frame_address(0))
-+do { \
-+ void * bp; \
-+ __asm__( "movl %%ebp, %0" : "=g"(bp)); \
-+ f = *((exceptionFrame*) bp); \
-+} while (0);
-
- /**/
- /* Method dispatch. */
-diff -ur kaffe-1.1.7/configure kaffe-1.1.7-autotooled/configure
---- kaffe-1.1.7/configure 2006-03-26 18:43:16.000000000 -0600
-+++ kaffe-1.1.7-autotooled/configure 2006-08-01 09:42:50.513674000 -0500
-@@ -3871,6 +3871,201 @@
- esac
-
-
-+## Required for gcc 4.1.x as long as kaffe's
-+## not cleaned up to use unions in classMethod.h
-+## where necessary.
-+echo "$as_me:$LINENO: checking CFLAGS for gcc -fno-strict-aliasing" >&5
-+echo $ECHO_N "checking CFLAGS for gcc -fno-strict-aliasing... $ECHO_C" >&6
-+if test "${ac_cv_cflags_gcc_option__fno_strict_aliasing+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_cflags_gcc_option__fno_strict_aliasing="no, unknown"
-+
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ ac_save_CFLAGS="$CFLAGS"
-+for ac_arg in "-pedantic % -fno-strict-aliasing" #
-+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_cflags_gcc_option__fno_strict_aliasing=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+ CFLAGS="$ac_save_CFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__fno_strict_aliasing" >&5
-+echo "${ECHO_T}$ac_cv_cflags_gcc_option__fno_strict_aliasing" >&6
-+case ".$ac_cv_cflags_gcc_option__fno_strict_aliasing" in
-+ .ok|.ok,*) ;;
-+ .|.no|.no,*) ;;
-+ *)
-+ if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__fno_strict_aliasing " 2>&1 >/dev/null
-+ then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__fno_strict_aliasing") >&5
-+ (: CFLAGS does contain $ac_cv_cflags_gcc_option__fno_strict_aliasing) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__fno_strict_aliasing\"") >&5
-+ (: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_strict_aliasing") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_strict_aliasing"
-+ fi
-+ ;;
-+esac
-+
-+
-+## Required for gcc 4.1.x and above, as it
-+## omits the frame pointer on -O1 and above on
-+## some architectures, notably i386, making
-+## it impossible to unwind exceptions.
-+echo "$as_me:$LINENO: checking CFLAGS for gcc -fno-omit-frame-pointer" >&5
-+echo $ECHO_N "checking CFLAGS for gcc -fno-omit-frame-pointer... $ECHO_C" >&6
-+if test "${ac_cv_cflags_gcc_option__fno_omit_frame_pointer+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_cflags_gcc_option__fno_omit_frame_pointer="no, unknown"
-+
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ ac_save_CFLAGS="$CFLAGS"
-+for ac_arg in "-pedantic % -fno-omit-frame-pointer" #
-+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_cflags_gcc_option__fno_omit_frame_pointer=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+ CFLAGS="$ac_save_CFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&5
-+echo "${ECHO_T}$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&6
-+case ".$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" in
-+ .ok|.ok,*) ;;
-+ .|.no|.no,*) ;;
-+ *)
-+ if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__fno_omit_frame_pointer " 2>&1 >/dev/null
-+ then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__fno_omit_frame_pointer") >&5
-+ (: CFLAGS does contain $ac_cv_cflags_gcc_option__fno_omit_frame_pointer) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__fno_omit_frame_pointer\"") >&5
-+ (: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_omit_frame_pointer") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_omit_frame_pointer"
-+ fi
-+ ;;
-+esac
-+
-+
-
-
-
-@@ -5991,7 +6186,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5994 "configure"' > conftest.$ac_ext
-+ echo '#line 6189 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -7368,7 +7563,7 @@
-
-
- # Provide some information about the compiler.
--echo "$as_me:7371:" \
-+echo "$as_me:7566:" \
- "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8435,11 +8630,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8438: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8633: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8442: \$? = $ac_status" >&5
-+ echo "$as_me:8637: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8703,11 +8898,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8706: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8901: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8710: \$? = $ac_status" >&5
-+ echo "$as_me:8905: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8807,11 +9002,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8810: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9005: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8814: \$? = $ac_status" >&5
-+ echo "$as_me:9009: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -11152,7 +11347,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11155 "configure"
-+#line 11350 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11252,7 +11447,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11255 "configure"
-+#line 11450 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13596,11 +13791,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13599: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13794: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13603: \$? = $ac_status" >&5
-+ echo "$as_me:13798: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -13700,11 +13895,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13703: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13898: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13707: \$? = $ac_status" >&5
-+ echo "$as_me:13902: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -15270,11 +15465,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15273: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15468: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15277: \$? = $ac_status" >&5
-+ echo "$as_me:15472: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15374,11 +15569,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15377: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15572: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15381: \$? = $ac_status" >&5
-+ echo "$as_me:15576: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -17581,11 +17776,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17584: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17779: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17588: \$? = $ac_status" >&5
-+ echo "$as_me:17783: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17849,11 +18044,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17852: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18047: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17856: \$? = $ac_status" >&5
-+ echo "$as_me:18051: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17953,11 +18148,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17956: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18151: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:17960: \$? = $ac_status" >&5
-+ echo "$as_me:18155: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-diff -ur kaffe-1.1.7/configure.ac kaffe-1.1.7-autotooled/configure.ac
---- kaffe-1.1.7/configure.ac 2006-03-26 16:56:01.000000000 -0600
-+++ kaffe-1.1.7-autotooled/configure.ac 2006-08-01 09:19:09.105354000 -0500
-@@ -187,6 +187,17 @@
- ## and GNU/Linux.
- AX_CFLAGS_GCC_OPTION([-mregnames])
-
-+## Required for gcc 4.1.x as long as kaffe's
-+## not cleaned up to use unions in classMethod.h
-+## where necessary.
-+AX_CFLAGS_GCC_OPTION([-fno-strict-aliasing])
-+
-+## Required for gcc 4.1.x and above, as it
-+## omits the frame pointer on -O1 and above on
-+## some architectures, notably i386, making
-+## it impossible to unwind exceptions.
-+AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer])
-+
- GCC_ATTRIBUTE_ALWAYS_INLINE
- GCC_ATTRIBUTE_CONST
- GCC_ATTRIBUTE_FORMAT
Deleted: trunk/kaffe/debian/patches/06_atomic_ia64.patch
===================================================================
--- trunk/kaffe/debian/patches/06_atomic_ia64.patch 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/patches/06_atomic_ia64.patch 2007-10-03 21:34:00 UTC (rev 4303)
@@ -1,68 +0,0 @@
-===================================================================
-RCS file: /cvs/kaffe/kaffe/config/ia64/atomic.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- kaffe/config/ia64/atomic.h 2005/12/28 01:49:47 1.3
-+++ kaffe-1.1.7/config/ia64/atomic.h 2006/07/15 15:01:06 1.4
-@@ -13,8 +13,8 @@
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-- 02110-1301 USA. */
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-
- #include "config-int.h"
- #include <ia64intrin.h>
-@@ -52,12 +52,12 @@
- (abort (), 0)
-
- #define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
-- (!__sync_bool_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
-- (int) (long) (newval)))
-+ (!__sync_bool_compare_and_swap ((mem), (int) (long) (oldval), \
-+ (int) (long) (newval)))
-
- #define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \
-- (!__sync_bool_compare_and_swap_di ((void *) (mem), (long) (oldval), \
-- (long) (newval)))
-+ (!__sync_bool_compare_and_swap ((mem), (long) (oldval), \
-+ (long) (newval)))
-
- #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
- (abort (), (__typeof (*mem)) 0)
-@@ -66,12 +66,11 @@
- (abort (), (__typeof (*mem)) 0)
-
- #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
-- __sync_val_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
-- (int) (long) (newval))
-+ __sync_val_compare_and_swap ((mem), (int) (long) (oldval), \
-+ (int) (long) (newval))
-
- #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-- __sync_val_compare_and_swap_di ((void *) (mem), (long) (oldval), \
-- (long) (newval))
-+ __sync_val_compare_and_swap ((mem), (long) (oldval), (long) (newval))
-
- /* Atomically store newval and return the old value. */
- #define atomic_exchange_acq(mem, value) \
-@@ -80,15 +79,9 @@
- #define atomic_exchange_rel(mem, value) \
- (__sync_synchronize (), __sync_lock_test_and_set (mem, value))
-
--
- #define atomic_exchange_and_add(mem, value) \
- ({ __typeof (*mem) __result; \
-- if (sizeof (*mem) == 4) \
-- __result = __sync_fetch_and_add_si ((void *) (mem), (int) (value)); \
-- else if (sizeof (*mem) == 8) \
-- __result = __sync_fetch_and_add_di ((void *) (mem), (long) (value)); \
-- else \
-- abort (); \
-+ __result = __sync_fetch_and_add ((mem), (int) (value)); \
- __result; })
-
- #define atomic_decrement_if_positive(mem) \
Modified: trunk/kaffe/debian/rules
===================================================================
--- trunk/kaffe/debian/rules 2007-10-03 19:13:45 UTC (rev 4302)
+++ trunk/kaffe/debian/rules 2007-10-03 21:34:00 UTC (rev 4303)
@@ -80,8 +80,7 @@
#
# DBS
#
-export DH_COMPAT=4
-RELEASE = 1.1.7
+RELEASE = 1.1.8
TAR_DIR = kaffe-$(RELEASE)
# the dbs rules
include /usr/share/dbs/dbs-build.mk
More information about the pkg-java-commits
mailing list