SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic: Rename SECONDARY_ARCHITECTURE to ARCHITECTURE_SECONDARY

Browse Source 
For easier integration with the _GPT_ALL_ARCHES macro in a future
commit.
This commit is contained in:
Daan De Meyer
2021-11-24 12:00:41 +01:00
parent 6d4c80ddbb
commit 3c58ae1313
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/architecture.h
+5 -5
View File
@@ -67,7 +67,7 @@ int uname_architecture(void);
# else
# define LIB_ARCH_TUPLE "x86_64-linux-gnu"
# endif
# define SECONDARY_ARCHITECTURE ARCHITECTURE_X86
# define ARCHITECTURE_SECONDARY ARCHITECTURE_X86
#elif defined(__i386__)
# define native_architecture() ARCHITECTURE_X86
# define LIB_ARCH_TUPLE "i386-linux-gnu"
@@ -75,11 +75,11 @@ int uname_architecture(void);
# if __BYTE_ORDER == __BIG_ENDIAN
# define native_architecture() ARCHITECTURE_PPC64
# define LIB_ARCH_TUPLE "ppc64-linux-gnu"
# define SECONDARY_ARCHITECTURE ARCHITECTURE_PPC
# define ARCHITECTURE_SECONDARY ARCHITECTURE_PPC
# else
# define native_architecture() ARCHITECTURE_PPC64_LE
# define LIB_ARCH_TUPLE "powerpc64le-linux-gnu"
# define SECONDARY_ARCHITECTURE ARCHITECTURE_PPC_LE
# define ARCHITECTURE_SECONDARY ARCHITECTURE_PPC_LE
# endif
#elif defined(__powerpc__)
# if __BYTE_ORDER == __BIG_ENDIAN
@@ -105,7 +105,7 @@ int uname_architecture(void);
#elif defined(__s390x__)
# define native_architecture() ARCHITECTURE_S390X
# define LIB_ARCH_TUPLE "s390x-linux-gnu"
# define SECONDARY_ARCHITECTURE ARCHITECTURE_S390
# define ARCHITECTURE_SECONDARY ARCHITECTURE_S390
#elif defined(__s390__)
# define native_architecture() ARCHITECTURE_S390
# define LIB_ARCH_TUPLE "s390-linux-gnu"
@@ -149,7 +149,7 @@ int uname_architecture(void);
# else
# define native_architecture() ARCHITECTURE_ARM64
# define LIB_ARCH_TUPLE "aarch64-linux-gnu"
# define SECONDARY_ARCHITECTURE ARCHITECTURE_ARM
# define ARCHITECTURE_SECONDARY ARCHITECTURE_ARM
# endif
#elif defined(__arm__)
# if __BYTE_ORDER == __BIG_ENDIAN
src/basic/process-util.c
+4 -4
View File
@@ -1045,8 +1045,8 @@ unsigned long personality_from_string(const char *p) {
if (architecture == native_architecture())
return PER_LINUX;
#ifdef SECONDARY_ARCHITECTURE
if (architecture == SECONDARY_ARCHITECTURE)
#ifdef ARCHITECTURE_SECONDARY
if (architecture == ARCHITECTURE_SECONDARY)
return PER_LINUX32;
#endif
@@ -1058,9 +1058,9 @@ const char* personality_to_string(unsigned long p) {
if (p == PER_LINUX)
architecture = native_architecture();
#ifdef SECONDARY_ARCHITECTURE
#ifdef ARCHITECTURE_SECONDARY
else if (p == PER_LINUX32)
architecture = SECONDARY_ARCHITECTURE;
architecture = ARCHITECTURE_SECONDARY;
#endif
if (architecture < 0)