changeset 740:64b653bb5e49

2008-02-18 Lillian Angel <langel@redhat.com> * Makefile.am: Added icedtea-always-zero.patch to DIST. * Makefile.in: Regenerated. * patches/icedtea-zero.patch: Removed erronous patch.
author Lillian Angel <langel@redhat.com>
date Mon, 18 Feb 2008 10:36:18 -0500
parents a9fff9ec1737
children b36927b152ac
files ChangeLog Makefile.am Makefile.in patches/icedtea-zero.patch
diffstat 4 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 18 08:13:08 2008 -0500
+++ b/ChangeLog	Mon Feb 18 10:36:18 2008 -0500
@@ -1,3 +1,9 @@
+2008-02-18  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Added icedtea-always-zero.patch to DIST.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-zero.patch: Removed erronous patch.
+
 2008-02-18  Gary Benson  <gbenson@redhat.com>
 
 	* patches/icedtea-zero.patch: Correctly locate the platform file.
--- a/Makefile.am	Mon Feb 18 08:13:08 2008 -0500
+++ b/Makefile.am	Mon Feb 18 10:36:18 2008 -0500
@@ -32,7 +32,7 @@
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
-	tools patches/icedtea-gcc-4.3.patch 
+	tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.
--- a/Makefile.in	Mon Feb 18 08:13:08 2008 -0500
+++ b/Makefile.in	Mon Feb 18 10:36:18 2008 -0500
@@ -214,7 +214,7 @@
 OPENJDK_VERSION = b05
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
-	tools patches/icedtea-gcc-4.3.patch 
+	tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch
 
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
--- a/patches/icedtea-zero.patch	Mon Feb 18 08:13:08 2008 -0500
+++ b/patches/icedtea-zero.patch	Mon Feb 18 10:36:18 2008 -0500
@@ -99,16 +99,6 @@
  
  LINK_VM = $(LINK_LIB.c)
  
---- gcc.make	2008-02-17 15:37:26.000000000 -0500
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2008-02-17 15:37:58.000000000 -0500
-@@ -57,6 +57,7 @@
- 
- VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
- 
-+CFLAGS += $(LIBFFI_CFLAGS)
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
- CFLAGS += -fno-exceptions
 diff -r 8e9761ee6dd6 openjdk/hotspot/build/linux/makefiles/buildtree.make
 --- openjdk/hotspot/build/linux/makefiles/buildtree.make	Mon Feb 18 11:56:36 2008 +0000
 +++ openjdk/hotspot/build/linux/makefiles/buildtree.make	Mon Feb 18 12:03:06 2008 +0000