commit e1e52ac21c3e95e4a518928098e4065c6ad34406
author Wei Shun Chang <wei.shun.chang@intel.com> Thu Aug 18 11:33:15 2016 +0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sun May 21 01:50:32 2017 +0000
tree dae22962b46b244c13c25e2c686b04ea85f7ecd3
parent 582a39357c02354c1ab6df70855ea6e6cecc1f66

Partially backport the MAYBE_STATIC macro from upstream

This patch partially backports the macro of MAYBE_STATIC from the
upstream for the next patch of ACPI table fixing.

Suggested by Wei-Shun, commit message by Harry.

BUG=chromium:611896
BRANCH=firmware-ninja-5216.383.B
TEST=rebuild firmware, image it to BYT chrome device,
do 'cat /proc/iomem' and examine System RAM in root's sibling.

Change-Id: I6735f2090fbee2a88733ccc0b7b06cd785ac5249
Signed-off-by: Harry Pan <harry.pan@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/372403
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/506290

src/include/stddef.h

diff --git a/src/include/stddef.h b/src/include/stddef.h
index 137de04..1219bc6 100644
--- a/src/include/stddef.h
+++ b/src/include/stddef.h
@@ -38,4 +38,12 @@
 #define ROMSTAGE_CONST
 #endif
 
+/* Work around non-writable data segment in execute-in-place romstage on x86. */
+#if defined(__PRE_RAM__) && CONFIG_ARCH_X86
+#define MAYBE_STATIC
+#else
+#define MAYBE_STATIC static
+#endif
+
+
 #endif /* STDDEF_H */