diff --git a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
index 1bd7b38f54..881251f03e 100644
--- a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
+++ b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
@@ -24,6 +24,12 @@ using namespace std;
 
 typedef UINT64 ulonglong_t;
 
+#ifdef __GNUC__
+#if __STDC_VERSION__ < 199901L
+#define __FUNCTION__ __FILE__
+#endif
+#endif
+
 template <class T>
 class CMemoryLeakChecker : public list<T*>
 {
diff --git a/Tools/CCode/Source/GenFvMap/build.xml b/Tools/CCode/Source/GenFvMap/build.xml
index 6d87631e8c..0d05b58e87 100644
--- a/Tools/CCode/Source/GenFvMap/build.xml
+++ b/Tools/CCode/Source/GenFvMap/build.xml
@@ -51,9 +51,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         debug="true"
         optimize="speed">
       <compilerarg value="${ExtraArgus}" if="ExtraArgus" />
+      <compilerarg value="-x" if="gcc"/>
+      <compilerarg value="c++" if="gcc"/>
       <compilerarg value="/EHsc" unless="gcc"/>
       <compilerarg value="/Za" unless="gcc"/>
-      <compilerarg value="-x c++" if="gcc"/>
+      
       
       <fileset dir="${basedir}/${ToolName}"
         includes="${FileSet}"