From 9693501c158d68431962938cb02e7d8d2ef89ca3 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 24 Jul 2013 02:17:02 -0400
Subject: change jmp_buf to share an underlying type and struct tag with
 sigjmp_buf

this is necessary to meet the C++ ABI target. alternatives were
considered to avoid the size increase for non-sig jmp_buf objects, but
they seemed to have worse properties. moreover, the relative size
increase is only extreme on x86[_64]; one way of interpreting this is
that, if the size increase from this patch makes jmp_buf use too much
memory, then the program was already using too much memory when built
for non-x86 archs.
---
 arch/arm/bits/setjmp.h        | 2 +-
 arch/i386/bits/setjmp.h       | 2 +-
 arch/microblaze/bits/setjmp.h | 2 +-
 arch/mips/bits/setjmp.h       | 2 +-
 arch/powerpc/bits/setjmp.h    | 2 +-
 arch/x86_64/bits/setjmp.h     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'arch')

diff --git a/arch/arm/bits/setjmp.h b/arch/arm/bits/setjmp.h
index 3938cb8a..55e3a95b 100644
--- a/arch/arm/bits/setjmp.h
+++ b/arch/arm/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf[32];
+typedef unsigned long long __jmp_buf[32];
diff --git a/arch/i386/bits/setjmp.h b/arch/i386/bits/setjmp.h
index 5610be9b..decd26dc 100644
--- a/arch/i386/bits/setjmp.h
+++ b/arch/i386/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[6];
+typedef unsigned long __jmp_buf[6];
diff --git a/arch/microblaze/bits/setjmp.h b/arch/microblaze/bits/setjmp.h
index 8f0376b2..b2bd9748 100644
--- a/arch/microblaze/bits/setjmp.h
+++ b/arch/microblaze/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[18];
+typedef unsigned long __jmp_buf[18];
diff --git a/arch/mips/bits/setjmp.h b/arch/mips/bits/setjmp.h
index 6bb15464..467872e9 100644
--- a/arch/mips/bits/setjmp.h
+++ b/arch/mips/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf [15];
+typedef unsigned long long __jmp_buf[15];
diff --git a/arch/powerpc/bits/setjmp.h b/arch/powerpc/bits/setjmp.h
index ab583aba..1cb0f26d 100644
--- a/arch/powerpc/bits/setjmp.h
+++ b/arch/powerpc/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf [56];
+typedef unsigned long long __jmp_buf[56];
diff --git a/arch/x86_64/bits/setjmp.h b/arch/x86_64/bits/setjmp.h
index 81d4968a..63973a80 100644
--- a/arch/x86_64/bits/setjmp.h
+++ b/arch/x86_64/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[8];
+typedef unsigned long __jmp_buf[8];
-- 
cgit v1.2.1