diff options
Diffstat (limited to 'meta/recipes-support/nspr/files')
5 files changed, 0 insertions, 251 deletions
diff --git a/meta/recipes-support/nspr/files/fix-build-on-aarch64.patch b/meta/recipes-support/nspr/files/fix-build-on-aarch64.patch deleted file mode 100644 index ccad0a1a14..0000000000 --- a/meta/recipes-support/nspr/files/fix-build-on-aarch64.patch +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | Add Aarch64 support | ||
2 | |||
3 | Signed-off-by: Riku Voipio <riku.voipio@linaro.org> | ||
4 | |||
5 | Upstream-Status: Submitted https://bugzilla.mozilla.org/show_bug.cgi?id=827271 | ||
6 | --- | ||
7 | configure.in | 12 ++++++------ | ||
8 | 1 files changed, 6 insertions(+), 6 deletions(-) | ||
9 | --- a/pr/include/md/_linux.cfg | ||
10 | +++ b/pr/include/md/_linux.cfg | ||
11 | @@ -861,6 +861,59 @@ | ||
12 | #define PR_BYTES_PER_WORD_LOG2 2 | ||
13 | #define PR_BYTES_PER_DWORD_LOG2 3 | ||
14 | |||
15 | +#elif defined(__aarch64__) | ||
16 | + | ||
17 | +#ifdef __AARCH64EB__ | ||
18 | +#undef IS_LITTLE_ENDIAN | ||
19 | +#define IS_BIG_ENDIAN 1 | ||
20 | +#elif defined(__AARCH64EL__) | ||
21 | +#define IS_LITTLE_ENDIAN 1 | ||
22 | +#undef IS_BIG_ENDIAN | ||
23 | +#else | ||
24 | +#error "Unknown Aarch64 endianness." | ||
25 | +#endif | ||
26 | +#define IS_64 | ||
27 | + | ||
28 | +#define PR_BYTES_PER_BYTE 1 | ||
29 | +#define PR_BYTES_PER_SHORT 2 | ||
30 | +#define PR_BYTES_PER_INT 4 | ||
31 | +#define PR_BYTES_PER_INT64 8 | ||
32 | +#define PR_BYTES_PER_LONG 8 | ||
33 | +#define PR_BYTES_PER_FLOAT 4 | ||
34 | +#define PR_BYTES_PER_DOUBLE 8 | ||
35 | +#define PR_BYTES_PER_WORD 8 | ||
36 | +#define PR_BYTES_PER_DWORD 8 | ||
37 | + | ||
38 | +#define PR_BITS_PER_BYTE 8 | ||
39 | +#define PR_BITS_PER_SHORT 16 | ||
40 | +#define PR_BITS_PER_INT 32 | ||
41 | +#define PR_BITS_PER_INT64 64 | ||
42 | +#define PR_BITS_PER_LONG 64 | ||
43 | +#define PR_BITS_PER_FLOAT 32 | ||
44 | +#define PR_BITS_PER_DOUBLE 64 | ||
45 | +#define PR_BITS_PER_WORD 64 | ||
46 | + | ||
47 | +#define PR_BITS_PER_BYTE_LOG2 3 | ||
48 | +#define PR_BITS_PER_SHORT_LOG2 4 | ||
49 | +#define PR_BITS_PER_INT_LOG2 5 | ||
50 | +#define PR_BITS_PER_INT64_LOG2 6 | ||
51 | +#define PR_BITS_PER_LONG_LOG2 6 | ||
52 | +#define PR_BITS_PER_FLOAT_LOG2 5 | ||
53 | +#define PR_BITS_PER_DOUBLE_LOG2 6 | ||
54 | +#define PR_BITS_PER_WORD_LOG2 6 | ||
55 | + | ||
56 | +#define PR_ALIGN_OF_SHORT 2 | ||
57 | +#define PR_ALIGN_OF_INT 4 | ||
58 | +#define PR_ALIGN_OF_LONG 8 | ||
59 | +#define PR_ALIGN_OF_INT64 8 | ||
60 | +#define PR_ALIGN_OF_FLOAT 4 | ||
61 | +#define PR_ALIGN_OF_DOUBLE 8 | ||
62 | +#define PR_ALIGN_OF_POINTER 8 | ||
63 | +#define PR_ALIGN_OF_WORD 8 | ||
64 | + | ||
65 | +#define PR_BYTES_PER_WORD_LOG2 3 | ||
66 | +#define PR_BYTES_PER_DWORD_LOG2 3 | ||
67 | + | ||
68 | #else | ||
69 | |||
70 | #error "Unknown CPU architecture" | ||
71 | --- a/pr/include/md/_linux.h | ||
72 | +++ b/pr/include/md/_linux.h | ||
73 | @@ -53,6 +53,8 @@ | ||
74 | #define _PR_SI_ARCHITECTURE "avr32" | ||
75 | #elif defined(__m32r__) | ||
76 | #define _PR_SI_ARCHITECTURE "m32r" | ||
77 | +#elif defined(__aarch64__) | ||
78 | +#define _PR_SI_ARCHITECTURE "aarch64" | ||
79 | #else | ||
80 | #error "Unknown CPU architecture" | ||
81 | #endif | ||
82 | @@ -186,7 +188,7 @@ | ||
83 | }) | ||
84 | #endif | ||
85 | |||
86 | -#if defined(__arm__) | ||
87 | +#if defined(__arm__) || defined(__aarch64__) | ||
88 | #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) | ||
89 | /* Use GCC built-in functions */ | ||
90 | #define _PR_HAVE_ATOMIC_OPS | ||
91 | @@ -242,6 +244,10 @@ | ||
92 | #endif | ||
93 | #endif /* __arm__ */ | ||
94 | |||
95 | +#if defined(__aarch64__) | ||
96 | +#define _MD_MINIMUM_STACK_SIZE 0x20000 | ||
97 | +#endif | ||
98 | + | ||
99 | #define USE_SETJMP | ||
100 | #if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) | ||
101 | #define _PR_POLL_AVAILABLE | ||
diff --git a/meta/recipes-support/nspr/files/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/files/fix-build-on-x86_64.patch deleted file mode 100644 index a6fa1ea607..0000000000 --- a/meta/recipes-support/nspr/files/fix-build-on-x86_64.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | Fix build failure on x86_64 | ||
2 | |||
3 | When the target_cpu is x86_64, we should assume that the pkg uses 64bit, | ||
4 | only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a | ||
5 | opposite logic before. | ||
6 | |||
7 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | --- | ||
11 | configure.in | 12 ++++++------ | ||
12 | 1 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/configure.in b/configure.in | ||
15 | index 39c96a3..99a03ac 100644 | ||
16 | --- a/configure.in | ||
17 | +++ b/configure.in | ||
18 | @@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.]) | ||
19 | PR_MD_ASFILES=os_Linux_ia64.s | ||
20 | ;; | ||
21 | x86_64) | ||
22 | - if test -n "$USE_64"; then | ||
23 | - PR_MD_ASFILES=os_Linux_x86_64.s | ||
24 | - else | ||
25 | + if test -n "$USE_N32"; then | ||
26 | AC_DEFINE(i386) | ||
27 | PR_MD_ASFILES=os_Linux_x86.s | ||
28 | CC="$CC -m32" | ||
29 | CXX="$CXX -m32" | ||
30 | + else | ||
31 | + PR_MD_ASFILES=os_Linux_x86_64.s | ||
32 | fi | ||
33 | ;; | ||
34 | ppc|powerpc) | ||
35 | PR_MD_ASFILES=os_Linux_ppc.s | ||
36 | ;; | ||
37 | powerpc64) | ||
38 | - if test -n "$USE_64"; then | ||
39 | + if test -n "$USE_N32"; then | ||
40 | + PR_MD_ASFILES=os_Linux_ppc.s | ||
41 | + else | ||
42 | CC="$CC -m64" | ||
43 | CXX="$CXX -m64" | ||
44 | - else | ||
45 | - PR_MD_ASFILES=os_Linux_ppc.s | ||
46 | fi | ||
47 | ;; | ||
48 | m68k) | ||
49 | -- | ||
50 | 1.7.1 | ||
51 | |||
diff --git a/meta/recipes-support/nspr/files/nspr.pc.in b/meta/recipes-support/nspr/files/nspr.pc.in deleted file mode 100644 index c37d0bcbd7..0000000000 --- a/meta/recipes-support/nspr/files/nspr.pc.in +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | os_libs=-lpthread -ldl | ||
2 | prefix=OEPREFIX | ||
3 | exec_prefix=OEEXECPREFIX | ||
4 | libdir=OELIBDIR | ||
5 | includedir=OEINCDIR | ||
6 | |||
7 | Name: NSPR | ||
8 | Description: The Netscape Portable Runtime | ||
9 | Version: 4.9.5 | ||
10 | Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl | ||
11 | Cflags: | ||
diff --git a/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch deleted file mode 100644 index a7e7853de1..0000000000 --- a/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Author: Andrei Gherzan <andrei@gherzan.ro> | ||
2 | Date: Thu Feb 9 00:03:38 2012 +0200 | ||
3 | |||
4 | Avoid QA warnings by removing hardcoded rpath from binaries. | ||
5 | |||
6 | [...] | ||
7 | WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib | ||
8 | in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait | ||
9 | [...] | ||
10 | |||
11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in | ||
15 | =================================================================== | ||
16 | --- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 | ||
17 | +++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 | ||
18 | @@ -379,7 +379,7 @@ | ||
19 | endif | ||
20 | |||
21 | ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) | ||
22 | - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) | ||
23 | + LDOPTS += -Xlinker | ||
24 | ifeq ($(USE_PTHREADS),1) | ||
25 | EXTRA_LIBS = -lpthread | ||
26 | endif | ||
diff --git a/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch b/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch deleted file mode 100644 index 8ca51e4d1f..0000000000 --- a/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | trickily fix build failure on x86_64 | ||
2 | |||
3 | It seems that we can not run the 'autoreconf -f -i' for the nspr, I met | ||
4 | several strange problems while trying to do that, and the previous | ||
5 | author seemed had noticed this, so he wrote: | ||
6 | |||
7 | do_configure() { | ||
8 | oe_runconf | ||
9 | } | ||
10 | |||
11 | to avoid running the "autoreconf". But we must modify configure.in to | ||
12 | fix the build failure on x86_64, so both modify configure and | ||
13 | configure.in, once the "autoreconf" can work correctly, we can remove | ||
14 | this patch. | ||
15 | |||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | |||
18 | Upstream-Status: Inappropriate [configuration] | ||
19 | --- | ||
20 | configure | 12 ++++++------ | ||
21 | 1 files changed, 6 insertions(+), 6 deletions(-) | ||
22 | |||
23 | diff --git a/configure b/configure | ||
24 | --- a/configure | ||
25 | +++ b/configure | ||
26 | @@ -4366,9 +4366,7 @@ EOF | ||
27 | PR_MD_ASFILES=os_Linux_ia64.s | ||
28 | ;; | ||
29 | x86_64) | ||
30 | - if test -n "$USE_64"; then | ||
31 | - PR_MD_ASFILES=os_Linux_x86_64.s | ||
32 | - else | ||
33 | + if test -n "$USE_N32"; then | ||
34 | cat >> confdefs.h <<\EOF | ||
35 | #define i386 1 | ||
36 | EOF | ||
37 | @@ -4376,17 +4374,19 @@ EOF | ||
38 | PR_MD_ASFILES=os_Linux_x86.s | ||
39 | CC="$CC -m32" | ||
40 | CXX="$CXX -m32" | ||
41 | + else | ||
42 | + PR_MD_ASFILES=os_Linux_x86_64.s | ||
43 | fi | ||
44 | ;; | ||
45 | ppc|powerpc) | ||
46 | PR_MD_ASFILES=os_Linux_ppc.s | ||
47 | ;; | ||
48 | powerpc64) | ||
49 | - if test -n "$USE_64"; then | ||
50 | + if test -n "$USE_N32"; then | ||
51 | + PR_MD_ASFILES=os_Linux_ppc.s | ||
52 | + else | ||
53 | CC="$CC -m64" | ||
54 | CXX="$CXX -m64" | ||
55 | - else | ||
56 | - PR_MD_ASFILES=os_Linux_ppc.s | ||
57 | fi | ||
58 | ;; | ||
59 | m68k) | ||
60 | -- | ||
61 | 1.7.1 | ||
62 | |||