chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: detect-virt: detect QEMU/KVM
[elogind.git]
/
src
/
shared
/
architecture.h
diff --git
a/src/shared/architecture.h
b/src/shared/architecture.h
index a014ad6c1d06f0237bf84ef38fb8f8be724edcf8..cb82418a5e4b62162aa28b9511133f1987a29c58 100644
(file)
--- a/
src/shared/architecture.h
+++ b/
src/shared/architecture.h
@@
-21,11
+21,16
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <endian.h>
+
#include "util.h"
#include "util.h"
-/* A cleaned up architecture definition */
+/* A cleaned up architecture definition. We don't want to get lost in
+ * processor features, models, generations or even ABIs. Hence we
+ * focus on general family, and distuignish word width and
+ * endianness. */
-
typedef enum Architecture
{
+
enum
{
ARCHITECTURE_X86 = 0,
ARCHITECTURE_X86_64,
ARCHITECTURE_PPC,
ARCHITECTURE_X86 = 0,
ARCHITECTURE_X86_64,
ARCHITECTURE_PPC,
@@
-55,9
+60,9
@@
typedef enum Architecture {
ARCHITECTURE_CRIS,
_ARCHITECTURE_MAX,
_ARCHITECTURE_INVALID = -1
ARCHITECTURE_CRIS,
_ARCHITECTURE_MAX,
_ARCHITECTURE_INVALID = -1
-}
Architecture
;
+};
-
Architecture
uname_architecture(void);
+
int
uname_architecture(void);
/*
* LIB_ARCH_TUPLE should resolve to the local library path
/*
* LIB_ARCH_TUPLE should resolve to the local library path
@@
-77,15
+82,15
@@
Architecture uname_architecture(void);
# define native_architecture() ARCHITECTURE_X86
# define LIB_ARCH_TUPLE "i386-linux-gnu"
#elif defined(__powerpc64__)
# define native_architecture() ARCHITECTURE_X86
# define LIB_ARCH_TUPLE "i386-linux-gnu"
#elif defined(__powerpc64__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_PPC64
# define LIB_ARCH_TUPLE "ppc64-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_PPC64_LE
# define native_architecture() ARCHITECTURE_PPC64
# define LIB_ARCH_TUPLE "ppc64-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_PPC64_LE
-#
error "Missing LIB_ARCH_TUPLE for PPC64LE
"
+#
define LIB_ARCH_TUPLE "powerpc64le-linux-gnu
"
# endif
#elif defined(__powerpc__)
# endif
#elif defined(__powerpc__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_PPC
# define LIB_ARCH_TUPLE "powerpc-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_PPC
# define LIB_ARCH_TUPLE "powerpc-linux-gnu"
# else
@@
-114,7
+119,7
@@
Architecture uname_architecture(void);
# define native_architecture() ARCHITECTURE_SPARC
# define LIB_ARCH_TUPLE "sparc-linux-gnu"
#elif defined(__mips64__)
# define native_architecture() ARCHITECTURE_SPARC
# define LIB_ARCH_TUPLE "sparc-linux-gnu"
#elif defined(__mips64__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_MIPS64
# error "Missing LIB_ARCH_TUPLE for MIPS64"
# else
# define native_architecture() ARCHITECTURE_MIPS64
# error "Missing LIB_ARCH_TUPLE for MIPS64"
# else
@@
-122,18
+127,18
@@
Architecture uname_architecture(void);
# error "Missing LIB_ARCH_TUPLE for MIPS64_LE"
# endif
#elif defined(__mips__)
# error "Missing LIB_ARCH_TUPLE for MIPS64_LE"
# endif
#elif defined(__mips__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_MIPS
# define LIB_ARCH_TUPLE "mips-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_MIPS_LE
# define LIB_ARCH_TUPLE "mipsel-linux-gnu"
# define native_architecture() ARCHITECTURE_MIPS
# define LIB_ARCH_TUPLE "mips-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_MIPS_LE
# define LIB_ARCH_TUPLE "mipsel-linux-gnu"
-#endif
+#
endif
#elif defined(__alpha__)
# define native_architecture() ARCHITECTURE_ALPHA
# define LIB_ARCH_TUPLE "alpha-linux-gnu"
#elif defined(__aarch64__)
#elif defined(__alpha__)
# define native_architecture() ARCHITECTURE_ALPHA
# define LIB_ARCH_TUPLE "alpha-linux-gnu"
#elif defined(__aarch64__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_ARM64_BE
# define LIB_ARCH_TUPLE "aarch64_be-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_ARM64_BE
# define LIB_ARCH_TUPLE "aarch64_be-linux-gnu"
# else
@@
-141,12
+146,16
@@
Architecture uname_architecture(void);
# define LIB_ARCH_TUPLE "aarch64-linux-gnu"
# endif
#elif defined(__arm__)
# define LIB_ARCH_TUPLE "aarch64-linux-gnu"
# endif
#elif defined(__arm__)
-# if
defined(WORDS_BIGENDIAN)
+# if
__BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_ARM_BE
# define native_architecture() ARCHITECTURE_ARM_BE
-# if defined(__ARM_PCS_VFP)
-# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf"
+# if defined(__ARM_EABI__)
+# if defined(__ARM_PCS_VFP)
+# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf"
+# else
+# define LIB_ARCH_TUPLE "armeb-linux-gnueabi"
+# endif
# else
# else
-# define LIB_ARCH_TUPLE "armeb-linux-gnu
eabi
"
+# define LIB_ARCH_TUPLE "armeb-linux-gnu"
# endif
# else
# define native_architecture() ARCHITECTURE_ARM
# endif
# else
# define native_architecture() ARCHITECTURE_ARM
@@
-176,8
+185,8
@@
Architecture uname_architecture(void);
# define native_architecture() ARCHITECTURE_CRIS
# error "Missing LIB_ARCH_TUPLE for CRIS"
#else
# define native_architecture() ARCHITECTURE_CRIS
# error "Missing LIB_ARCH_TUPLE for CRIS"
#else
-#error "Please register your architecture here!"
+#
error "Please register your architecture here!"
#endif
#endif
-const char *architecture_to_string(
Architecture
a) _const_;
-
Architecture
architecture_from_string(const char *s) _pure_;
+const char *architecture_to_string(
int
a) _const_;
+
int
architecture_from_string(const char *s) _pure_;