Index: /branches/reyalp-flt/tools/elf2flt/flt.h
===================================================================
--- /branches/reyalp-flt/tools/elf2flt/flt.h	(revision 1537)
+++ /branches/reyalp-flt/tools/elf2flt/flt.h	(revision 1538)
@@ -31,5 +31,5 @@
 
 
-#define	FLAT_VERSION	    0x00000006L
+#define	FLAT_VERSION	    0x00000007L
 #define FLAT_MAGIC_NUMBER   "CFLAT"
 
Index: /branches/reyalp-flt/tools/makeexport.c
===================================================================
--- /branches/reyalp-flt/tools/makeexport.c	(revision 1537)
+++ /branches/reyalp-flt/tools/makeexport.c	(revision 1538)
@@ -179,6 +179,10 @@
 		if ( *cur=='}') {break;}
 
+        int is_address = 0;
 	    if (*cur=='&')
+        {
+            is_address = 1;
 			for(cur++; *cur==9 || *cur==' '; cur++);
+        }
 
 		cursym=cur;
@@ -196,5 +200,7 @@
 			memcpy(symbol,cursym,size);
 			symbol[size]=0;
-            strcpy(full_symbol,symbol);
+            full_symbol[0] = 0;
+            if (is_address) strcpy(full_symbol,"&");
+            strcat(full_symbol,symbol);
 			cut_export_token(symbol);
 
@@ -223,5 +229,5 @@
     for (n=0; n<hash_idx; n++)
     {
-        fprintf(out_hash,"{ 0x%08x, &%s },\n",hash_vals[n].hash,hash_vals[n].symbol);
+        fprintf(out_hash,"{ 0x%08x, %s },\n",hash_vals[n].hash,hash_vals[n].symbol);
     }