Mercurial > hg > release > icedtea6-1.12
changeset 3014:72801116cb84 icedtea6-1.12.6
Make 7158805 patch apply again.
2013-07-10 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
Make patch apply again.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 10 Jul 2013 15:13:09 +0100 |
| parents | 410b4993d8df |
| children | c0fe7f2171d4 |
| files | ChangeLog patches/ecj/jcp-importsources.patch patches/security/20130618/7158805-nested_subroutine_rewriting.patch |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 10 14:25:35 2013 +0100 +++ b/ChangeLog Wed Jul 10 15:13:09 2013 +0100 @@ -1,3 +1,8 @@ +2013-07-10 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Make patch apply again. + 2013-07-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/jcp-importsources.patch Wed Jul 10 15:13:09 2013 +0100 @@ -0,0 +1,10 @@ +--- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 ++++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 +@@ -31,6 +31,7 @@ + PACKAGE = org.jcp + PRODUCT = jcp + include $(BUILDDIR)/common/Defs.gmk ++SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java) + + # + # Files to compile
--- a/patches/security/20130618/7158805-nested_subroutine_rewriting.patch Wed Jul 10 14:25:35 2013 +0100 +++ b/patches/security/20130618/7158805-nested_subroutine_rewriting.patch Wed Jul 10 15:13:09 2013 +0100 @@ -149,7 +149,6 @@ +#include <new> + #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1) -@@ -38,6 +38,12 @@ #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK)