Changeset 3111 in kBuild

Timestamp:

Oct 22, 2017 11:38:15 AM (8 years ago)

Author:

bird

Message:

Config.kmk,env.sh,header.kmk: x32

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• kBuild/env.sh (modified) (1 diff)
• kBuild/header.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -347 +347 @@
  # Make sure we get the right bit count in the output.
  TEMPLATE_BIN_CFLAGS.x86       += -m32
+ TEMPLATE_BIN_CFLAGS.x32       += -mx32
  TEMPLATE_BIN_CFLAGS.sparc32   += -m32
  TEMPLATE_BIN_CFLAGS.amd64     += -m64
  TEMPLATE_BIN_CFLAGS.sparc64   += -m64
  TEMPLATE_BIN_CXXFLAGS.x86     += -m32
+ TEMPLATE_BIN_CXXFLAGS.x32     += -mx32
  TEMPLATE_BIN_CXXFLAGS.sparc32 += -m32
  TEMPLATE_BIN_CXXFLAGS.amd64   += -m64
  TEMPLATE_BIN_CXXFLAGS.sparc64 += -m64
  TEMPLATE_BIN_LDFLAGS.x86      += -m32
+ TEMPLATE_BIN_LDFLAGS.x32      += -mx32
  TEMPLATE_BIN_LDFLAGS.sparc32  += -m32
  TEMPLATE_BIN_LDFLAGS.amd64    += -m64

trunk/kBuild/env.sh

@@ -338 +338 @@
         x86_64|AMD64|amd64|k8|k8l|k9|k10)
             KBUILD_HOST_ARCH='amd64'
+            # Try detect debian x32.
+            if test "$KBUILD_HOST" = "linux"; then 
+                case "`uname -v`" in 
+                    *Debian*+x32+*) KBUILD_HOST_ARCH=x32 ;;
+                esac
+            fi
             ;;
         x86|i86pc|ia32|i[3456789]86|BePC|i[3456789]86-AT[3456789]86)

trunk/kBuild/header.kmk

@@ -198 +198 @@
 #
 KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64
+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32
+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32
 KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32