Index: Library/BaseStackCheckLib/BaseStackCheckGcc.c
===================================================================
--- Library/BaseStackCheckLib/BaseStackCheckGcc.c	(revision 15896)
+++ Library/BaseStackCheckLib/BaseStackCheckGcc.c	(working copy)
@@ -2,11 +2,12 @@
  Base Stack Check library for GCC/clang.
 
  Use -fstack-protector-all compiler flag to make the compiler insert the
- __stack_chk_guard "canary" value into the stack and check the value prior
- to exiting the function. If the "canary" is overwritten __stack_chk_fail()
+ StackChkGuard "canary" value into the stack and check the value prior
+ to exiting the function. If the "canary" is overwritten StackChkFail()
  is called. This is GCC specific code.
 
  Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
+ Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
  This program and the accompanying materials
  are licensed and made available under the terms and conditions of the BSD License
  which accompanies this distribution.  The full text of the license may be found at
@@ -23,10 +24,10 @@
 #include <Library/PcdLib.h>
 
 /// "canary" value that is inserted by the compiler into the stack frame.
-VOID *__stack_chk_guard = (VOID*)0x0AFF;
+VOID *StackChkGuard = (VOID*)0x0AFF;
 
 // If ASLR was enabled we could use
-//void (*__stack_chk_guard)(void) = __stack_chk_fail;
+//void (*StackChkGuard)(void) = StackChkFail;
 
 /**
  Error path for compiler generated stack "canary" value check code. If the
@@ -34,7 +35,7 @@
  function.
 **/
 VOID
-__stack_chk_fail (
+StackChkFail (
  VOID
  )
 {
@@ -50,6 +51,6 @@
   if ((DebugPropertyMask & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) {
     CpuBreakpoint ();
   } else if ((DebugPropertyMask & DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED) != 0) {
-   CpuDeadLoop ();
+    CpuDeadLoop ();
   }
 }