sim: unify platform function & header tests

[thirdparty/binutils-gdb.git] / sim / common / defs.h

diff --git a/sim/common/defs.h b/sim/common/defs.h
index 957e36d3c93c1dc3a4be026224a1b2e181780e24..4b5da7bfa3696248b7d13b8d055a700efde2d399 100644 (file)
--- a/sim/common/defs.h
+++ b/sim/common/defs.h
@@ -34,9 +34,21 @@
 #undef PACKAGE_URL
 #undef PACKAGE_VERSION
 
-/* Include sim's various configure tests.  */
+/* Include arch-specific sim's various configure tests.  */
 #include "config.h"
 
+/* Reset macros that our config.h will provide.  */
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION
+
+/* Include common sim's various configure tests.  */
+#include "../config.h"
+
 #endif
 
 #endif