chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: rename ARCH_TUPLE to LIB_ARCH_TUPLE
[elogind.git]
/
src
/
shared
/
architecture.h
diff --git
a/src/shared/architecture.h
b/src/shared/architecture.h
index b94adae8853ff88c073bac180a23dc0cc32e3a04..6a3f0b2d4b51f9d436bbaed33f25606c522a9a29 100644
(file)
--- a/
src/shared/architecture.h
+++ b/
src/shared/architecture.h
@@
-60,111
+60,114
@@
typedef enum Architecture {
Architecture uname_architecture(void);
/*
Architecture uname_architecture(void);
/*
- * ARCH_TUPLE should resolve to the local architecture systemd is
- * built for, according to the Debian tuple list:
+ * LIB_ARCH_TUPLE should resolve to the local library path
+ * architecture tuple systemd is built for, according to the Debian
+ * tuple list:
*
* https://wiki.debian.org/Multiarch/Tuples
*
*
* https://wiki.debian.org/Multiarch/Tuples
*
+ * This is used in library search paths that should understand
+ * Debian's paths on all distributions.
*/
#if defined(__x86_64__)
# define native_architecture() ARCHITECTURE_X86_64
*/
#if defined(__x86_64__)
# define native_architecture() ARCHITECTURE_X86_64
-# define ARCH_TUPLE "x86_64-linux-gnu"
+# define
LIB_
ARCH_TUPLE "x86_64-linux-gnu"
#elif defined(__i386__)
# define native_architecture() ARCHITECTURE_X86
#elif defined(__i386__)
# define native_architecture() ARCHITECTURE_X86
-# define ARCH_TUPLE "i386-linux-gnu"
+# define
LIB_
ARCH_TUPLE "i386-linux-gnu"
#elif defined(__powerpc64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_PPC64
#elif defined(__powerpc64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_PPC64
-# define ARCH_TUPLE "ppc64-linux-gnu"
+# define
LIB_
ARCH_TUPLE "ppc64-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_PPC64_LE
# else
# define native_architecture() ARCHITECTURE_PPC64_LE
-# error "Missing ARCH_TUPLE for PPC64LE"
+# error "Missing
LIB_
ARCH_TUPLE for PPC64LE"
# endif
#elif defined(__powerpc__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_PPC
# endif
#elif defined(__powerpc__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_PPC
-# define ARCH_TUPLE "powerpc-linux-gnu"
+# define
LIB_
ARCH_TUPLE "powerpc-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_PPC_LE
# else
# define native_architecture() ARCHITECTURE_PPC_LE
-# error "Missing ARCH_TUPLE for PPCLE"
+# error "Missing
LIB_
ARCH_TUPLE for PPCLE"
# endif
#elif defined(__ia64__)
# define native_architecture() ARCHITECTURE_IA64
# endif
#elif defined(__ia64__)
# define native_architecture() ARCHITECTURE_IA64
-# define ARCH_TUPLE "ia64-linux-gnu"
+# define
LIB_
ARCH_TUPLE "ia64-linux-gnu"
#elif defined(__hppa64__)
# define native_architecture() ARCHITECTURE_PARISC64
#elif defined(__hppa64__)
# define native_architecture() ARCHITECTURE_PARISC64
-# error "Missing ARCH_TUPLE for HPPA64"
+# error "Missing
LIB_
ARCH_TUPLE for HPPA64"
#elif defined(__hppa__)
# define native_architecture() ARCHITECTURE_PARISC
#elif defined(__hppa__)
# define native_architecture() ARCHITECTURE_PARISC
-# define ARCH_TUPLE "hppa‑linux‑gnu"
+# define
LIB_
ARCH_TUPLE "hppa‑linux‑gnu"
#elif defined(__s390x__)
# define native_architecture() ARCHITECTURE_S390X
#elif defined(__s390x__)
# define native_architecture() ARCHITECTURE_S390X
-# define ARCH_TUPLE "s390x-linux-gnu"
+# define
LIB_
ARCH_TUPLE "s390x-linux-gnu"
#elif defined(__s390__)
# define native_architecture() ARCHITECTURE_S390
#elif defined(__s390__)
# define native_architecture() ARCHITECTURE_S390
-# define ARCH_TUPLE "s390-linux-gnu"
+# define
LIB_
ARCH_TUPLE "s390-linux-gnu"
#elif defined(__sparc64__)
# define native_architecture() ARCHITECTURE_SPARC64
#elif defined(__sparc64__)
# define native_architecture() ARCHITECTURE_SPARC64
-# define ARCH_TUPLE "sparc64-linux-gnu"
+# define
LIB_
ARCH_TUPLE "sparc64-linux-gnu"
#elif defined(__sparc__)
# define native_architecture() ARCHITECTURE_SPARC
#elif defined(__sparc__)
# define native_architecture() ARCHITECTURE_SPARC
-# define ARCH_TUPLE "sparc-linux-gnu"
+# define
LIB_
ARCH_TUPLE "sparc-linux-gnu"
#elif defined(__mips64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_MIPS64
#elif defined(__mips64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_MIPS64
-# error "Missing ARCH_TUPLE for MIPS64"
+# error "Missing
LIB_
ARCH_TUPLE for MIPS64"
# else
# define native_architecture() ARCHITECTURE_MIPS64_LE
# else
# define native_architecture() ARCHITECTURE_MIPS64_LE
-# error "Missing ARCH_TUPLE for MIPS64_LE"
+# error "Missing
LIB_
ARCH_TUPLE for MIPS64_LE"
# endif
#elif defined(__mips__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_MIPS
# endif
#elif defined(__mips__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_MIPS
-# define ARCH_TUPLE "mips-linux-gnu"
+# define
LIB_
ARCH_TUPLE "mips-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_MIPS_LE
# else
# define native_architecture() ARCHITECTURE_MIPS_LE
-# define ARCH_TUPLE "mipsel-linux-gnu"
+# define
LIB_
ARCH_TUPLE "mipsel-linux-gnu"
#endif
#elif defined(__alpha__)
# define native_architecture() ARCHITECTURE_ALPHA
#endif
#elif defined(__alpha__)
# define native_architecture() ARCHITECTURE_ALPHA
-# define ARCH_TUPLE "alpha-linux-gnu"
+# define
LIB_
ARCH_TUPLE "alpha-linux-gnu"
#elif defined(__aarch64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM64_BE
#elif defined(__aarch64__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM64_BE
-# define ARCH_TUPLE "aarch64_be-linux-gnu"
+# define
LIB_
ARCH_TUPLE "aarch64_be-linux-gnu"
# else
# define native_architecture() ARCHITECTURE_ARM64
# else
# define native_architecture() ARCHITECTURE_ARM64
-# define ARCH_TUPLE "aarch64-linux-gnu"
+# define
LIB_
ARCH_TUPLE "aarch64-linux-gnu"
# endif
#elif defined(__arm__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM_BE
# endif
#elif defined(__arm__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM_BE
-# error "Missing ARCH_TUPLE for ARM_BE"
+# error "Missing
LIB_
ARCH_TUPLE for ARM_BE"
# else
# if defined(__ARM_PCS_VFP)
# define native_architecture() ARCHITECTURE_ARM
# else
# if defined(__ARM_PCS_VFP)
# define native_architecture() ARCHITECTURE_ARM
-# define ARCH_TUPLE "arm-linux-gnueabihf"
+# define
LIB_
ARCH_TUPLE "arm-linux-gnueabihf"
# else
# define native_architecture() ARCHITECTURE_ARM
# else
# define native_architecture() ARCHITECTURE_ARM
-# define ARCH_TUPLE "arm-linux-gnueabi"
+# define
LIB_
ARCH_TUPLE "arm-linux-gnueabi"
# endif
# endif
#elif defined(__sh64__)
# define native_architecture() ARCHITECTURE_SH64
# endif
# endif
#elif defined(__sh64__)
# define native_architecture() ARCHITECTURE_SH64
-# error "Missing ARCH_TUPLE for SH64"
+# error "Missing
LIB_
ARCH_TUPLE for SH64"
#elif defined(__sh__)
# define native_architecture() ARCHITECTURE_SH
#elif defined(__sh__)
# define native_architecture() ARCHITECTURE_SH
-# define ARCH_TUPLE "sh4-linux-gnu"
+# define
LIB_
ARCH_TUPLE "sh4-linux-gnu"
#elif defined(__m68k__)
# define native_architecture() ARCHITECTURE_M68K
#elif defined(__m68k__)
# define native_architecture() ARCHITECTURE_M68K
-# define ARCH_TUPLE "m68k-linux-gnu"
+# define
LIB_
ARCH_TUPLE "m68k-linux-gnu"
#elif defined(__tilegx__)
# define native_architecture() ARCHITECTURE_TILEGX
#elif defined(__tilegx__)
# define native_architecture() ARCHITECTURE_TILEGX
-# error "Missing ARCH_TUPLE for TILEGX"
+# error "Missing
LIB_
ARCH_TUPLE for TILEGX"
#elif defined(__cris__)
# define native_architecture() ARCHITECTURE_CRIS
#elif defined(__cris__)
# define native_architecture() ARCHITECTURE_CRIS
-# error "Missing ARCH_TUPLE for CRIS"
+# error "Missing
LIB_
ARCH_TUPLE for CRIS"
#else
#error "Please register your architecture here!"
#endif
#else
#error "Please register your architecture here!"
#endif