| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 /* | 7 /* |
| 8 * NaCl Basic Common Definitions. | 8 * NaCl Basic Common Definitions. |
| 9 */ | 9 */ |
| 10 #ifndef NATIVE_CLIENT_SRC_INCLUDE_NACL_BASE_H_ | 10 #ifndef NATIVE_CLIENT_SRC_INCLUDE_NACL_BASE_H_ |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 */ | 63 */ |
| 64 #define NACL_MERGE(x, y) x ## y | 64 #define NACL_MERGE(x, y) x ## y |
| 65 #define NACL_ARCH(x) NACL_MERGE(NACL_, x) | 65 #define NACL_ARCH(x) NACL_MERGE(NACL_, x) |
| 66 /* | 66 /* |
| 67 * Avoid using 0, because "#if FOO == 0" is true if FOO is undefined, and does | 67 * Avoid using 0, because "#if FOO == 0" is true if FOO is undefined, and does |
| 68 * not produce a warning or error. | 68 * not produce a warning or error. |
| 69 */ | 69 */ |
| 70 #define NACL_x86 1 | 70 #define NACL_x86 1 |
| 71 #define NACL_arm 2 | 71 #define NACL_arm 2 |
| 72 #define NACL_mips 3 | 72 #define NACL_mips 3 |
| 73 #define NACL_mipsel NACL_mips |
| 73 | 74 |
| 74 /***************************************************************************** | 75 /***************************************************************************** |
| 75 * Architecture name encodings. | 76 * Architecture name encodings. |
| 76 * | 77 * |
| 77 * NACL_ARCH_NAME(name, arch) - Name specific to the given architecture, | 78 * NACL_ARCH_NAME(name, arch) - Name specific to the given architecture, |
| 78 * NACL_SUBARCH_NAME(name, arch, subarch) - Name specific to the | 79 * NACL_SUBARCH_NAME(name, arch, subarch) - Name specific to the |
| 79 * given architecture and subarchitecture. | 80 * given architecture and subarchitecture. |
| 80 */ | 81 */ |
| 81 #define NACL_MERGE_ARCH_NAME(name, arch) NaCl_ ## name ## _ ## arch | 82 #define NACL_MERGE_ARCH_NAME(name, arch) NaCl_ ## name ## _ ## arch |
| 82 #define NACL_ARCH_NAME(name, arch) NACL_MERGE_ARCH_NAME(name, arch) | 83 #define NACL_ARCH_NAME(name, arch) NACL_MERGE_ARCH_NAME(name, arch) |
| 83 #define NACL_MERGE_SUBARCH_NAME(name, arch, subarch) \ | 84 #define NACL_MERGE_SUBARCH_NAME(name, arch, subarch) \ |
| 84 NaCl_ ## name ## _ ## arch ## _ ## subarch | 85 NaCl_ ## name ## _ ## arch ## _ ## subarch |
| 85 #define NACL_SUBARCH_NAME(name, arch, subarch) \ | 86 #define NACL_SUBARCH_NAME(name, arch, subarch) \ |
| 86 NACL_MERGE_SUBARCH_NAME(name, arch, subarch) | 87 NACL_MERGE_SUBARCH_NAME(name, arch, subarch) |
| 87 | 88 |
| 88 #endif /* NATIVE_CLIENT_SRC_INCLUDE_NACL_BASE_H_ */ | 89 #endif /* NATIVE_CLIENT_SRC_INCLUDE_NACL_BASE_H_ */ |
| OLD | NEW |