Changeset bd29f9c9 in mainline for uspace/srv/loader/interp.S

Timestamp:

2012-07-30T20:01:02Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

542e819, beb9336

Parents:

c15849c (diff), 597b12e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/srv/loader/interp.S (modified) (1 diff)

uspace/srv/loader/interp.S

@@ -5 +5 @@
 #
 
-#ifdef UARCH_arm32
-#define AT_NOTE %note
-#else
-#define AT_NOTE @note
+#if ((defined(UARCH_abs32le)) && (defined(COMPILER_gcc_cross)) \
+    && (defined(CROSS_TARGET_arm32)))
+        #define ATSIGN(arg)  % ## arg
 #endif
 
-.section .interp, "a", AT_NOTE
+#ifdef UARCH_arm32
+        #define ATSIGN(arg)  % ## arg
+#endif
+
+#ifndef ATSIGN
+        #define ATSIGN(arg)  @ ## arg
+#endif
+
+.section .interp, "a", ATSIGN(progbits)
         .string "kernel"