summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch70
-rw-r--r--meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb (renamed from meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb)5
2 files changed, 3 insertions, 72 deletions
diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch b/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch
deleted file mode 100644
index c051075949..0000000000
--- a/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Tue, 15 Mar 2016 10:09:26 +0300
4Subject: [PATCH] Add initial nios2 architecture support
5
6* src/Makefile.am (nobase_private_HEADERS): Add nios2.h.
7* src/atomic_ops.h: Include nios2.h if __nios2__.
8* src/atomic_ops/sysdeps/gcc/nios2.h: New file.
9
10Signed-off-by: Marek Vasut <marex@denx.de>
11Upstream-Status: Backport [ https://github.com/ivmai/libatomic_ops.git 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 ]
12---
13 src/Makefile.am | 1 +
14 src/atomic_ops.h | 3 +++
15 src/atomic_ops/sysdeps/gcc/nios2.h | 17 +++++++++++++++++
16 3 files changed, 21 insertions(+)
17 create mode 100644 src/atomic_ops/sysdeps/gcc/nios2.h
18
19diff --git a/src/Makefile.am b/src/Makefile.am
20index fc09b27..d463427 100644
21--- a/src/Makefile.am
22+++ b/src/Makefile.am
23@@ -79,6 +79,7 @@ nobase_private_HEADERS = atomic_ops/ao_version.h \
24 atomic_ops/sysdeps/gcc/ia64.h \
25 atomic_ops/sysdeps/gcc/m68k.h \
26 atomic_ops/sysdeps/gcc/mips.h \
27+ atomic_ops/sysdeps/gcc/nios2.h \
28 atomic_ops/sysdeps/gcc/powerpc.h \
29 atomic_ops/sysdeps/gcc/s390.h \
30 atomic_ops/sysdeps/gcc/sh.h \
31diff --git a/src/atomic_ops.h b/src/atomic_ops.h
32index 33fe00e..ec02ba4 100644
33--- a/src/atomic_ops.h
34+++ b/src/atomic_ops.h
35@@ -262,6 +262,9 @@
36 # if defined(__m68k__)
37 # include "atomic_ops/sysdeps/gcc/m68k.h"
38 # endif /* __m68k__ */
39+# if defined(__nios2__)
40+# include "atomic_ops/sysdeps/gcc/nios2.h"
41+# endif /* __nios2__ */
42 # if defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \
43 || defined(__powerpc64__) || defined(__ppc64__)
44 # include "atomic_ops/sysdeps/gcc/powerpc.h"
45diff --git a/src/atomic_ops/sysdeps/gcc/nios2.h b/src/atomic_ops/sysdeps/gcc/nios2.h
46new file mode 100644
47index 0000000..f402cbb
48--- /dev/null
49+++ b/src/atomic_ops/sysdeps/gcc/nios2.h
50@@ -0,0 +1,17 @@
51+/*
52+ * Copyright (C) 2016 Marek Vasut <marex@denx.de>
53+ *
54+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
55+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
56+ *
57+ * Permission is hereby granted to use or copy this program
58+ * for any purpose, provided the above notices are retained on all copies.
59+ * Permission to modify the code and to distribute modified code is granted,
60+ * provided the above notices are retained, and a notice that the code was
61+ * modified is included with the above copyright notice.
62+ */
63+
64+#include "../test_and_set_t_is_ao_t.h"
65+#include "generic.h"
66+
67+#define AO_T_IS_INT
68--
692.7.0
70
diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb
index 4463d86c86..f7b416352d 100644
--- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb
+++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ 7 file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \
8 " 8 "
9PV .= "+git${SRCPV}" 9PV .= "+git${SRCPV}"
10SRCBRANCH ?= "release-7_6"
10 11
11SRCREV = "73c60c5ef1ed370111549ee5aab6d4020ba70ed4" 12SRCREV = "5ae4b4aeea2baf13752d07e3038c47f70f06dcac"
12SRC_URI = "git://github.com/ivmai/libatomic_ops" 13SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}"
13 14
14S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
15 16