fixup! native: 64 bit compatibility and Linux/x86_64 support for the …

…native board
RIOT-OS · Aug 18, 2023 · 554c916 · 554c916
1 parent e939795
commit 554c916
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
@@ -41,7 +41,9 @@ ifeq (,$(filter -std=%, $(CFLAGS)))
 endif
 
 ifeq ($(OS_ARCH),x86_64)
-  ifneq ($(NATIVE_64BIT), y)
+  ifeq ($(NATIVE_64BIT), y)
+    CFLAGS += -m64
+  else
     CFLAGS += -m32
   endif
 endif
@@ -50,7 +52,9 @@ ifneq (,$(filter -DDEVELHELP,$(CFLAGS)))
 endif
 ifeq ($(OS),FreeBSD)
   ifeq ($(OS_ARCH),amd64)
-    ifneq ($(NATIVE_64BIT), y)
+    ifeq ($(NATIVE_64BIT), y)
+      CFLAGS += -m64
+    else
       CFLAGS += -m32 -DCOMPAT_32BIT -B/usr/lib32
     endif
   endif
@@ -64,13 +68,17 @@ CXXUWFLAGS +=
 CXXEXFLAGS +=
 
 ifeq ($(OS_ARCH),x86_64)
-  ifneq ($(NATIVE_64BIT), y)
+  ifeq ($(NATIVE_64BIT), y)
+    LINKFLAGS += -m64
+  else
     LINKFLAGS += -m32
   endif
 endif
 ifeq ($(OS),FreeBSD)
   ifeq ($(OS_ARCH),amd64)
     ifneq ($(NATIVE_64BIT), y)
+      LINKFLAGS += -m64
+    else    
       LINKFLAGS += -m32 -DCOMPAT_32BIT -L/usr/lib32 -B/usr/lib32
     endif
   endif

diff --git a/cpu/native/Makefile.features b/cpu/native/Makefile.features
@@ -2,10 +2,10 @@ ifeq (FreeBSD,$(OS))
   DISABLE_LIBSTDCPP ?= 1
 endif
 
-ifneq ($(NATIVE_64BIT), y)
-  FEATURES_PROVIDED += arch_32bit
-else
+ifeq ($(NATIVE_64BIT), y)
   FEATURES_PROVIDED += arch_64bit
+else
+  FEATURES_PROVIDED += arch_32bit
 endif
 FEATURES_PROVIDED += arch_native
 FEATURES_PROVIDED += cpp