summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mozilla-build-arm.patch12
-rw-r--r--rhbz-911314.patch534
-rw-r--r--xulrunner-24.0-s390-inlines.patch14
-rw-r--r--xulrunner.spec18
4 files changed, 24 insertions, 554 deletions
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index 6e27f78..0fed214 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,12 +1,12 @@
-diff -up xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build
---- xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon 2013-09-11 01:15:02.000000000 +0200
-+++ xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build 2013-09-16 11:23:40.487028288 +0200
+diff -up xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build
+--- xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm 2013-10-23 15:52:17.056493264 +0200
++++ xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build 2013-10-23 16:03:04.496045050 +0200
@@ -61,7 +61,7 @@ else:
'yuv_row_other.cpp',
]
--if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
+if CONFIG['HAVE_ARM_NEON']:
- CPP_SOURCES += [
- 'yuv_convert_arm.cpp',
+ ASFILES += [
+ 'yuv_row_arm.s',
]
diff --git a/rhbz-911314.patch b/rhbz-911314.patch
deleted file mode 100644
index 3a62c8d..0000000
--- a/rhbz-911314.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-diff -up xulrunner-21.0/mozilla-release/js/public/HeapAPI.h.ppc xulrunner-21.0/mozilla-release/js/public/HeapAPI.h
---- xulrunner-21.0/mozilla-release/js/public/HeapAPI.h.ppc 2013-05-12 23:56:19.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/public/HeapAPI.h 2013-05-21 23:14:04.698238150 +0200
-@@ -11,24 +11,7 @@
- namespace js {
- namespace gc {
-
--/*
-- * Page size must be static to support our arena pointer optimizations, so we
-- * are forced to support each platform with non-4096 pages as a special case.
-- * Note: The freelist supports a maximum arena shift of 15.
-- * Note: Do not use JS_CPU_SPARC here, this header is used outside JS.
-- */
--#if (defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
-- (defined(__sparc) || defined(__sparcv9) || defined(__ia64))
--const size_t PageShift = 13;
--const size_t ArenaShift = PageShift;
--#elif defined(__powerpc64__)
--const size_t PageShift = 16;
- const size_t ArenaShift = 12;
--#else
--const size_t PageShift = 12;
--const size_t ArenaShift = PageShift;
--#endif
--const size_t PageSize = size_t(1) << PageShift;
- const size_t ArenaSize = size_t(1) << ArenaShift;
- const size_t ArenaMask = ArenaSize - 1;
-
-diff -up xulrunner-21.0/mozilla-release/js/src/gc/Heap.h.ppc xulrunner-21.0/mozilla-release/js/src/gc/Heap.h
---- xulrunner-21.0/mozilla-release/js/src/gc/Heap.h.ppc 2013-05-12 23:56:19.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/gc/Heap.h 2013-05-21 23:14:04.693238124 +0200
-@@ -812,7 +812,7 @@ struct Chunk
-
- /* Search for a decommitted arena to allocate. */
- unsigned findDecommittedArenaOffset();
-- ArenaHeader* fetchNextDecommittedArena();
-+ ArenaHeader* fetchNextDecommittedArena(JSRuntime *rt);
-
- public:
- /* Unlink and return the freeArenasHead. */
-diff -up xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp.ppc xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp
---- xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp.ppc 2013-05-12 23:56:19.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp 2013-05-21 23:14:04.693238124 +0200
-@@ -8,6 +8,7 @@
- #include "mozilla/Assertions.h"
-
- #include "jsapi.h"
-+#include "jscntxt.h"
-
- #include "js/HeapAPI.h"
- #include "js/Utility.h"
-@@ -18,39 +19,34 @@ using namespace js::gc;
-
- /* Unused memory decommiting requires the arena size match the page size. */
- static bool
--DecommitEnabled()
-+DecommitEnabled(JSRuntime *rt)
- {
-- return PageSize == ArenaSize;
-+ return rt->gcSystemPageSize == ArenaSize;
- }
-
- #if defined(XP_WIN)
- #include "jswin.h"
- #include <psapi.h>
-
--static size_t AllocationGranularity = 0;
--
- void
--gc::InitMemorySubsystem()
-+gc::InitMemorySubsystem(JSRuntime *rt)
- {
- SYSTEM_INFO sysinfo;
- GetSystemInfo(&sysinfo);
-- if (sysinfo.dwPageSize != PageSize) {
-- fprintf(stderr,"SpiderMonkey compiled with incorrect page size; please update js/public/HeapAPI.h.\n");
-- MOZ_CRASH();
-- }
-- AllocationGranularity = sysinfo.dwAllocationGranularity;
-+ rt->gcSystemPageSize = sysinfo.dwPageSize;
-+ rt->gcSystemAllocGranularity = sysinfo.dwAllocationGranularity;
- }
-
- void *
--gc::MapAlignedPages(size_t size, size_t alignment)
-+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment)
- {
- JS_ASSERT(size >= alignment);
- JS_ASSERT(size % alignment == 0);
-- JS_ASSERT(size % PageSize == 0);
-- JS_ASSERT(alignment % AllocationGranularity == 0);
-+ JS_ASSERT(size % rt->gcSystemPageSize == 0);
-+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0);
-
- /* Special case: If we want allocation alignment, no further work is needed. */
-- if (alignment == AllocationGranularity) {
-+ if (alignment == rt->gcSystemAllocGranularity) {
- return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- }
-
-@@ -74,7 +70,7 @@ gc::MapAlignedPages(size_t size, size_t
- if (!p)
- return NULL;
- void *chunkStart = (void *)(uintptr_t(p) + (alignment - (uintptr_t(p) % alignment)));
-- UnmapPages(p, size * 2);
-+ UnmapPages(rt, p, size * 2);
- p = VirtualAlloc(chunkStart, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-
- /* Failure here indicates a race with another thread, so try again. */
-@@ -85,26 +81,26 @@ gc::MapAlignedPages(size_t size, size_t
- }
-
- void
--gc::UnmapPages(void *p, size_t size)
-+gc::UnmapPages(JSRuntime *rt, void *p, size_t size)
- {
- JS_ALWAYS_TRUE(VirtualFree(p, 0, MEM_RELEASE));
- }
-
- bool
--gc::MarkPagesUnused(void *p, size_t size)
-+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size)
- {
-- if (!DecommitEnabled())
-- return false;
-+ if (!DecommitEnabled(rt))
-+ return true;
-
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- LPVOID p2 = VirtualAlloc(p, size, MEM_RESET, PAGE_READWRITE);
- return p2 == p;
- }
-
- bool
--gc::MarkPagesInUse(void *p, size_t size)
-+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size)
- {
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
-@@ -126,12 +122,13 @@ gc::GetPageFaultCount()
- #define OS2_MAX_RECURSIONS 16
-
- void
--gc::InitMemorySubsystem()
-+gc::InitMemorySubsystem(JSRuntime *rt)
- {
-+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = ArenaSize;
- }
-
- void
--gc::UnmapPages(void *addr, size_t size)
-+gc::UnmapPages(JSRuntime *rt, void *addr, size_t size)
- {
- if (!DosFreeMem(addr))
- return;
-@@ -152,7 +149,7 @@ gc::UnmapPages(void *addr, size_t size)
- }
-
- static void *
--gc::MapAlignedPagesRecursively(size_t size, size_t alignment, int& recursions)
-+gc::MapAlignedPagesRecursively(JSRuntime *rt, size_t size, size_t alignment, int& recursions)
- {
- if (++recursions >= OS2_MAX_RECURSIONS)
- return NULL;
-@@ -178,7 +175,7 @@ gc::MapAlignedPagesRecursively(size_t si
- unsigned long rc = DosQueryMem(&(static_cast<char*>(tmp))[size],
- &cb, &flags);
- if (!rc && (flags & PAG_FREE) && cb >= filler) {
-- UnmapPages(tmp, 0);
-+ UnmapPages(rt, tmp, 0);
- if (DosAllocMem(&tmp, filler,
- OBJ_ANY | PAG_COMMIT | PAG_READ | PAG_WRITE)) {
- JS_ALWAYS_TRUE(DosAllocMem(&tmp, filler,
-@@ -186,19 +183,19 @@ gc::MapAlignedPagesRecursively(size_t si
- }
- }
-
-- void *p = MapAlignedPagesRecursively(size, alignment, recursions);
-- UnmapPages(tmp, 0);
-+ void *p = MapAlignedPagesRecursively(rt, size, alignment, recursions);
-+ UnmapPages(rt, tmp, 0);
-
- return p;
- }
-
- void *
--gc::MapAlignedPages(size_t size, size_t alignment)
-+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment)
- {
- JS_ASSERT(size >= alignment);
- JS_ASSERT(size % alignment == 0);
-- JS_ASSERT(size % PageSize == 0);
-- JS_ASSERT(alignment % PageSize == 0);
-+ JS_ASSERT(size % rt->gcSystemPageSize == 0);
-+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0);
-
- int recursions = -1;
-
-@@ -207,7 +204,7 @@ gc::MapAlignedPages(size_t size, size_t
- * of the right size by recursively allocating blocks of unaligned
- * free memory until only an aligned allocation is possible.
- */
-- void *p = MapAlignedPagesRecursively(size, alignment, recursions);
-+ void *p = MapAlignedPagesRecursively(rt, size, alignment, recursions);
- if (p)
- return p;
-
-@@ -229,16 +226,15 @@ gc::MapAlignedPages(size_t size, size_t
- }
-
- bool
--gc::MarkPagesUnused(void *p, size_t size)
--{
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+MarkPagesUnused(JSRuntime *rt, void *p, size_t size) {
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
- bool
--gc::MarkPagesInUse(void *p, size_t size)
-+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size)
- {
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
-@@ -258,17 +254,18 @@ gc::GetPageFaultCount()
- #endif
-
- void
--gc::InitMemorySubsystem()
-+gc::InitMemorySubsystem(JSRuntime *rt)
- {
-+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = size_t(sysconf(_SC_PAGESIZE));
- }
-
- void *
--gc::MapAlignedPages(size_t size, size_t alignment)
-+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment)
- {
- JS_ASSERT(size >= alignment);
- JS_ASSERT(size % alignment == 0);
-- JS_ASSERT(size % PageSize == 0);
-- JS_ASSERT(alignment % PageSize == 0);
-+ JS_ASSERT(size % rt->gcSystemPageSize == 0);
-+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0);
-
- int prot = PROT_READ | PROT_WRITE;
- int flags = MAP_PRIVATE | MAP_ANON | MAP_ALIGN | MAP_NOSYNC;
-@@ -280,22 +277,22 @@ gc::MapAlignedPages(size_t size, size_t
- }
-
- void
--gc::UnmapPages(void *p, size_t size)
-+gc::UnmapPages(JSRuntime *rt, void *p, size_t size)
- {
- JS_ALWAYS_TRUE(0 == munmap((caddr_t)p, size));
- }
-
- bool
--gc::MarkPagesUnused(void *p, size_t size)
-+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size)
- {
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
- bool
--gc::MarkPagesInUse(void *p, size_t size)
-+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size)
- {
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
-@@ -313,27 +310,24 @@ gc::GetPageFaultCount()
- #include <unistd.h>
-
- void
--gc::InitMemorySubsystem()
-+gc::InitMemorySubsystem(JSRuntime *rt)
- {
-- if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) {
-- fprintf(stderr,"SpiderMonkey compiled with incorrect page size; please update js/public/HeapAPI.h.\n");
-- MOZ_CRASH();
-- }
-+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = size_t(sysconf(_SC_PAGESIZE));
- }
-
- void *
--gc::MapAlignedPages(size_t size, size_t alignment)
-+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment)
- {
- JS_ASSERT(size >= alignment);
- JS_ASSERT(size % alignment == 0);
-- JS_ASSERT(size % PageSize == 0);
-- JS_ASSERT(alignment % PageSize == 0);
-+ JS_ASSERT(size % rt->gcSystemPageSize == 0);
-+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0);
-
- int prot = PROT_READ | PROT_WRITE;
- int flags = MAP_PRIVATE | MAP_ANON;
-
- /* Special case: If we want page alignment, no further work is needed. */
-- if (alignment == PageSize) {
-+ if (alignment == rt->gcSystemAllocGranularity) {
- return mmap(NULL, size, prot, flags, -1, 0);
- }
-
-@@ -359,26 +353,26 @@ gc::MapAlignedPages(size_t size, size_t
- }
-
- void
--gc::UnmapPages(void *p, size_t size)
-+gc::UnmapPages(JSRuntime *rt, void *p, size_t size)
- {
- JS_ALWAYS_TRUE(0 == munmap(p, size));
- }
-
- bool
--gc::MarkPagesUnused(void *p, size_t size)
-+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size)
- {
-- if (!DecommitEnabled())
-- return false;
-+ if (!DecommitEnabled(rt))
-+ return true;
-
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- int result = madvise(p, size, MADV_DONTNEED);
- return result != -1;
- }
-
- bool
--gc::MarkPagesInUse(void *p, size_t size)
-+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size)
- {
-- JS_ASSERT(uintptr_t(p) % PageSize == 0);
-+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0);
- return true;
- }
-
-diff -up xulrunner-21.0/mozilla-release/js/src/gc/Memory.h.ppc xulrunner-21.0/mozilla-release/js/src/gc/Memory.h
---- xulrunner-21.0/mozilla-release/js/src/gc/Memory.h.ppc 2013-05-12 23:56:19.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/gc/Memory.h 2013-05-21 23:14:04.693238124 +0200
-@@ -16,20 +16,20 @@ namespace gc {
-
- // Sanity check that our compiled configuration matches the currently running
- // instance and initialize any runtime data needed for allocation.
--void InitMemorySubsystem();
-+void InitMemorySubsystem(JSRuntime *rt);
-
- // Allocate or deallocate pages from the system with the given alignment.
--void *MapAlignedPages(size_t size, size_t alignment);
--void UnmapPages(void *p, size_t size);
-+void *MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment);
-+void UnmapPages(JSRuntime *rt, void *p, size_t size);
-
- // Tell the OS that the given pages are not in use, so they should not
- // be written to a paging file. This may be a no-op on some platforms.
--bool MarkPagesUnused(void *p, size_t size);
-+bool MarkPagesUnused(JSRuntime *rt, void *p, size_t size);
-
- // Undo |MarkPagesUnused|: tell the OS that the given pages are of interest
- // and should be paged in and out normally. This may be a no-op on some
- // platforms.
--bool MarkPagesInUse(void *p, size_t size);
-+bool MarkPagesInUse(JSRuntime *rt, void *p, size_t size);
-
- // Returns #(hard faults) + #(soft faults)
- size_t GetPageFaultCount();
-diff -up xulrunner-21.0/mozilla-release/js/src/jsapi.cpp.ppc xulrunner-21.0/mozilla-release/js/src/jsapi.cpp
---- xulrunner-21.0/mozilla-release/js/src/jsapi.cpp.ppc 2013-05-12 23:56:21.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/jsapi.cpp 2013-05-21 23:14:04.695238134 +0200
-@@ -1110,8 +1110,6 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe
- #undef MSG_DEF
- #endif /* DEBUG */
-
-- InitMemorySubsystem();
--
- if (!js::TlsPerThreadData.init())
- return NULL;
-
-diff -up xulrunner-21.0/mozilla-release/js/src/jscntxt.h.ppc xulrunner-21.0/mozilla-release/js/src/jscntxt.h
---- xulrunner-21.0/mozilla-release/js/src/jscntxt.h.ppc 2013-05-12 23:56:21.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/jscntxt.h 2013-05-21 23:14:04.696238140 +0200
-@@ -1026,6 +1026,15 @@ struct JSRuntime : js::RuntimeFriendFiel
- /* Stack of thread-stack-allocated GC roots. */
- js::AutoGCRooter *autoGCRooters;
-
-+ /*
-+ * The GC can only safely decommit memory when the page size of the
-+ * running process matches the compiled arena size.
-+ */
-+ size_t gcSystemPageSize;
-+
-+ /* The OS allocation granularity may not match the page size. */
-+ size_t gcSystemAllocGranularity;
-+
- /* Strong references on scripts held for PCCount profiling API. */
- js::ScriptAndCountsVector *scriptAndCountsVector;
-
-diff -up xulrunner-21.0/mozilla-release/js/src/jsgc.cpp.ppc xulrunner-21.0/mozilla-release/js/src/jsgc.cpp
---- xulrunner-21.0/mozilla-release/js/src/jsgc.cpp.ppc 2013-05-12 23:56:21.000000000 +0200
-+++ xulrunner-21.0/mozilla-release/js/src/jsgc.cpp 2013-05-21 23:15:40.198740765 +0200
-@@ -465,13 +465,13 @@ FinalizeArenas(FreeOp *fop,
- }
-
- static inline Chunk *
--AllocChunk() {
-- return static_cast<Chunk *>(MapAlignedPages(ChunkSize, ChunkSize));
-+AllocChunk(JSRuntime *rt) {
-+ return static_cast<Chunk *>(MapAlignedPages(rt, ChunkSize, ChunkSize));
- }
-
- static inline void
--FreeChunk(Chunk *p) {
-- UnmapPages(static_cast<void *>(p), ChunkSize);
-+FreeChunk(JSRuntime *rt, Chunk *p) {
-+ UnmapPages(rt, static_cast<void *>(p), ChunkSize);
- }
-
- inline bool
-@@ -561,25 +561,25 @@ ChunkPool::expire(JSRuntime *rt, bool re
- }
-
- static void
--FreeChunkList(Chunk *chunkListHead)
-+FreeChunkList(JSRuntime *rt, Chunk *chunkListHead)
- {
- while (Chunk *chunk = chunkListHead) {
- JS_ASSERT(!chunk->info.numArenasFreeCommitted);
- chunkListHead = chunk->info.next;
-- FreeChunk(chunk);
-+ FreeChunk(rt, chunk);
- }
- }
-
- void
- ChunkPool::expireAndFree(JSRuntime *rt, bool releaseAll)
- {
-- FreeChunkList(expire(rt, releaseAll));
-+ FreeChunkList(rt, expire(rt, releaseAll));
- }
-
- /* static */ Chunk *
- Chunk::allocate(JSRuntime *rt)
- {
-- Chunk *chunk = static_cast<Chunk *>(AllocChunk());
-+ Chunk *chunk = static_cast<Chunk *>(AllocChunk(rt));
-
- #ifdef JSGC_ROOT_ANALYSIS
- // Our poison pointers are not guaranteed to be invalid on 64-bit
-@@ -592,7 +592,7 @@ Chunk::allocate(JSRuntime *rt)
- // were marked as uncommitted, but it's a little complicated to avoid
- // clobbering pre-existing unrelated mappings.
- while (IsPoisonedPtr(chunk))
-- chunk = static_cast<Chunk *>(AllocChunk());
-+ chunk = static_cast<Chunk *>(AllocChunk(rt));
- #endif
-
- if (!chunk)
-@@ -608,7 +608,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu
- {
- JS_ASSERT(chunk);
- chunk->prepareToBeFreed(rt);
-- FreeChunk(chunk);
-+ FreeChunk(rt, chunk);
- }
-
- inline void
-@@ -725,7 +725,7 @@ Chunk::findDecommittedArenaOffset()
- }
-
- ArenaHeader *
--Chunk::fetchNextDecommittedArena()
-+Chunk::fetchNextDecommittedArena(JSRuntime *rt)
- {
- JS_ASSERT(info.numArenasFreeCommitted == 0);
- JS_ASSERT(info.numArenasFree > 0);
-@@ -736,7 +736,7 @@ Chunk::fetchNextDecommittedArena()
- decommittedArenas.unset(offset);
-
- Arena *arena = &arenas[offset];
-- MarkPagesInUse(arena, ArenaSize);
-+ MarkPagesInUse(rt, arena, ArenaSize);
- arena->aheader.setAsNotAllocated();
-
- return &arena->aheader;
-@@ -770,7 +770,7 @@ Chunk::allocateArena(Zone *zone, AllocKi
-
- ArenaHeader *aheader = JS_LIKELY(info.numArenasFreeCommitted > 0)
- ? fetchNextFreeArena(rt)
-- : fetchNextDecommittedArena();
-+ : fetchNextDecommittedArena(rt);
- aheader->init(zone, thingKind);
- if (JS_UNLIKELY(!hasAvailableArenas()))
- removeFromAvailableList();
-@@ -937,6 +937,8 @@ static const int64_t JIT_SCRIPT_RELEASE_
- JSBool
- js_InitGC(JSRuntime *rt, uint32_t maxbytes)
- {
-+ InitMemorySubsystem(rt);
-+
- if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY))
- return false;
-
-@@ -2102,7 +2104,7 @@ DecommitArenasFromAvailableList(JSRuntim
- Maybe<AutoUnlockGC> maybeUnlock;
- if (!rt->isHeapBusy())
- maybeUnlock.construct(rt);
-- ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
-+ ok = MarkPagesUnused(rt, aheader->getArena(), ArenaSize);
- }
-
- if (ok) {
-@@ -2170,7 +2172,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo
- {
- if (Chunk *toFree = rt->gcChunkPool.expire(rt, shouldShrink)) {
- AutoUnlockGC unlock(rt);
-- FreeChunkList(toFree);
-+ FreeChunkList(rt, toFree);
- }
-
- if (shouldShrink)
diff --git a/xulrunner-24.0-s390-inlines.patch b/xulrunner-24.0-s390-inlines.patch
index 92175a3..074f8d9 100644
--- a/xulrunner-24.0-s390-inlines.patch
+++ b/xulrunner-24.0-s390-inlines.patch
@@ -1,12 +1,12 @@
-diff -up xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp
---- xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-09-11 01:15:09.000000000 +0200
-+++ xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-09-13 13:39:16.908478613 +0200
-@@ -9,6 +9,8 @@
- #include "jsnum.h"
- #include "jsscript.h"
+diff -up xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp
+--- xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-10-23 16:04:01.773093979 +0200
++++ xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-10-23 16:04:44.551134551 +0200
+@@ -4,6 +4,8 @@
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "jscntxtinlines.h"
+
#include "vm/SPSProfiler.h"
- #include "vm/StringBuffer.h"
+ #include "mozilla/DebugOnly.h"
diff --git a/xulrunner.spec b/xulrunner.spec
index 5649d73..79bfccb 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -90,7 +90,7 @@
Summary: XUL Runtime for Gecko Applications
Name: %{shortname}-last
-Version: 24.0
+Version: 25.0
Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -113,7 +113,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch
# Fedora specific patches
Patch20: mozilla-193-pkgconfig.patch
-Patch21: rhbz-911314.patch
# Unable to install addons from https pages
Patch24: rhbz-966424.patch
@@ -281,10 +280,6 @@ cd %{tarballdir}
%patch19 -p2 -b .s390-inlines
%patch20 -p2 -b .pk
-%ifarch ppc ppc64
-%patch21 -p2 -b .ppc
-%endif
-
%patch24 -p1 -b .966424
%{__rm} -f .mozconfig
@@ -600,6 +595,15 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Oct 29 2013 Remi Collet <RPMS@FamilleCollet.com> - 25.0-1
+- sync with rawhide, update to 25.0
+
+* Wed Oct 23 2013 Martin Stransky <stransky@redhat.com> - 25.0-1
+- Update to 25.0 Build 2
+
+* Tue Oct 15 2013 Karsten Hopp <karsten@redhat.com> 24.0-3
+- drop PPC-only rhbz-911314.patch, fixed upstream
+
* Mon Sep 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 24.0-1
- sync with rawhide, update to 24.0
@@ -609,7 +613,7 @@ fi
* Fri Sep 13 2013 Martin Stransky <stransky@redhat.com> - 24.0.1-1
- Update to 24.0
-* Mon Sep 2 2013 Dan Horák <dan[at]danny.cz> - 23.0.1-4
+* Mon Sep 2 2013 Dan Horák <dan[at]danny.cz> - 23.0.1-4
- Fix build on 64-bit big endian platforms (mozbz#618485)
* Sat Aug 31 2013 Karsten Hopp <karsten@redhat.com> 23.0.1-3