Changeset 5139d21 in rtems for c/src/lib

Timestamp:

01/10/15 19:04:06 (8 years ago)

Author:

Anthony Green <green@…>

Branches:

4.11, 5, master

Children:

99a1f122

Parents:

5759510

git-author:

Anthony Green <green@…> (01/10/15 19:04:06)

git-committer:

Joel Sherrill <joel.sherrill@…> (01/10/15 19:04:06)

Message:

moxiesim: Add conditional logic to handle old and new gas syntax

Location:

c/src/lib/libbsp/moxie/moxiesim

Files:

• configure.ac (modified) (1 diff)
• start/start.S (modified) (2 diffs)

c/src/lib/libbsp/moxie/moxiesim/configure.ac

@@ -18 +18 @@
 RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
 
+AC_MSG_CHECKING([for old moxie assembly syntax])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+    [],
+    [asm("sub.l $r0, $r0");])],
+  [HAVE_OLD_MOXIE_ASM=yes],
+  [HAVE_OLD_MOXIE_ASM=no])
+AC_MSG_RESULT([$HAVE_OLD_MOXIE_ASM])
+if test "x$HAVE_OLD_MOXIE_ASM" = xyes; then
+  AC_DEFINE(HAVE_OLD_MOXIE_ASM, 
+            1, [Define if you are using old moxie asm syntax (sub.l)])
+fi
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])

c/src/lib/libbsp/moxie/moxiesim/start/start.S

@@ -1 @@
-/* Copyright (C) 2011, 2013  Anthony Green */
+/* Copyright (C) 2011, 2013, 2014  Anthony Green */
 
 /* moxie start up file. */
 
+#include "bspopts.h"
+
+#if defined(HAVE_OLD_MOXIE_ASM)
+#define sub sub.l
+#endif
+        
         .text
         .global _start
@@ -13 +19 @@
         xor     $r1, $r1
         ldi.l   $r2, __bss_end__
-        sub.l   $r2, $r0
+        sub     $r2, $r0
         jsra    memset