[rtems commit] score/cpu/or1k: Add cpuatomic.h to fix broken build.

Joel Sherril joel at rtems.org
Wed Mar 4 23:24:27 UTC 2015


Module:    rtems
Branch:    master
Commit:    3358d62fe782c3c3ce3e9f70e1d6e79ad66263df
Changeset: http://git.rtems.org/rtems/commit/?id=3358d62fe782c3c3ce3e9f70e1d6e79ad66263df

Author:    Hesham ALMatary <heshamelmatary at gmail.com>
Date:      Wed Mar  4 17:15:41 2015 -0600

score/cpu/or1k: Add cpuatomic.h to fix broken build.

4e3d9a4d6c76fba8e31138d503f736405dafc213 broke or1k, cpuatomic.h has to
be added to all architectures.

---

 cpukit/score/cpu/or1k/Makefile.am             |  3 +--
 cpukit/score/cpu/or1k/preinstall.am           |  4 ++++
 cpukit/score/cpu/or1k/rtems/score/cpuatomic.h | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am
index b9e00d3..89b603b 100644
--- a/cpukit/score/cpu/or1k/Makefile.am
+++ b/cpukit/score/cpu/or1k/Makefile.am
@@ -11,13 +11,12 @@ include_rtems_scoredir = $(includedir)/rtems/score
 
 include_rtems_score_HEADERS =
 include_rtems_score_HEADERS += rtems/score/cpu.h
+include_rtems_score_HEADERS += rtems/score/cpuatomic.h
 include_rtems_score_HEADERS += rtems/score/cpu_asm.h
 include_rtems_score_HEADERS += rtems/score/types.h
 include_rtems_score_HEADERS += rtems/score/or1k.h
 include_rtems_score_HEADERS += rtems/score/or1k-utility.h
 
-
-
 noinst_LIBRARIES = libscorecpu.a
 
 libscorecpu_a_SOURCES =
diff --git a/cpukit/score/cpu/or1k/preinstall.am b/cpukit/score/cpu/or1k/preinstall.am
index f4d7153..6e15e20 100644
--- a/cpukit/score/cpu/or1k/preinstall.am
+++ b/cpukit/score/cpu/or1k/preinstall.am
@@ -31,6 +31,10 @@ $(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
 
+$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
+
 $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h b/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h
new file mode 100644
index 0000000..598ee76
--- /dev/null
+++ b/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h
@@ -0,0 +1,14 @@
+/*
+ * COPYRIGHT (c) 2012-2013 Deng Hengyi.
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef _RTEMS_SCORE_ATOMIC_CPU_H
+#define _RTEMS_SCORE_ATOMIC_CPU_H
+
+#include <rtems/score/cpustdatomic.h>
+
+#endif /* _RTEMS_SCORE_ATOMIC_CPU_H */



More information about the vc mailing list