summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/mdb/Makefile.common7
-rw-r--r--usr/src/cmd/mdb/Makefile.module12
-rw-r--r--usr/src/cmd/mdb/intel/amd64/Makefile6
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libpython/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libpython/Makefile61
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libpython/Makefile51
-rw-r--r--usr/src/cmd/mdb/sparc/v9/Makefile1
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libpython/Makefile2
8 files changed, 17 insertions, 125 deletions
diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common
index addce45930..10c38700ef 100644
--- a/usr/src/cmd/mdb/Makefile.common
+++ b/usr/src/cmd/mdb/Makefile.common
@@ -41,7 +41,6 @@ COMMON_MODULES_PROC = \
libmlsvc \
libnvpair \
libproc \
- libpython \
libsysevent \
libtopo \
libumem \
@@ -52,6 +51,12 @@ COMMON_MODULES_PROC = \
mdb_test
#
+# MDB modules used for debugging user processes which are only 64-bit
+#
+COMMON_MODULES_PROC_64BIT = \
+ libpython
+
+#
# MDB modules used for debugging user processes which are only 32-bit
#
COMMON_MODULES_PROC_32BIT = \
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index 91cc124e9c..48603894b2 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -96,15 +96,9 @@ ROOTTGTS = $(ROOTTGTS_$(MDBTGT))
# building with an LFS python, we attempt to use -isystem when it's
# available.
#
-PYCPPFLAGS = -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-PYCPPFLAGS += -_cc=-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-PYLNFLAGS = -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-
-#
-# At this time, we do not have python27 in the adjunct proto area, only
-# python26. As such, we explicitly override the python version dmod here.
-#
-PYTHON_VERSION = 2.6
+PYCPPFLAGS = -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
+PYCPPFLAGS += -_cc=-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
+PYLNFLAGS = -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
kvm_TGTFLAGS = -D_KERNEL
proc_TGTFLAGS = -D_USER
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile
index 39d3574f15..93bb4e2fdb 100644
--- a/usr/src/cmd/mdb/intel/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/Makefile
@@ -26,7 +26,11 @@
include ../../Makefile.common
-MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM)
+MODULES = \
+ $(COMMON_MODULES_PROC) \
+ $(COMMON_MODULES_PROC_64BIT) \
+ $(COMMON_MODULES_KVM)
+
MODULES += disk_label uhci libsmbios
SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
diff --git a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
index d78b5e0fc2..7937144a67 100644
--- a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
@@ -25,7 +25,7 @@
include $(SRC)/Makefile.master
-MODULE = libpython$(PYTHON_VERSION).so
+MODULE = libpython$(PYTHON3_VERSION).so
MDBTGT = proc
MODULE_NAME = libpython
diff --git a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
deleted file mode 100644
index 9e19bf2e41..0000000000
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# Copyright (c) 2018, Joyent, Inc.
-
-include $(SRC)/Makefile.master
-
-MODULE = libpython$(PYTHON_VERSION).so
-MDBTGT = proc
-MODULE_NAME = libpython
-
-MODSRCS_DIR = ../../../common/modules/libpython
-
-MODSRCS = libpython.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.ia32
-include ../../../Makefile.module
-
-%.o := CPPFLAGS += $(PYCPPFLAGS)
-%.ln := CPPFLAGS += $(PYLNFLAGS)
-
-#
-# Why these? Well, the pyconfig.h header hard-codes _FILE_OFFSET_BITS
-# to 64, regardless of what we have set here. GCC quietens this complaint via
-# use of -isystem, but neither lint nor smatch can do that.
-#
-LINTFLAGS += -erroff=E_MACRO_REDEFINED
-
-# not linted
-SMATCH=off
-
-dmod/$(MODULE) := LDLIBS += -lproc
-
-%.o: $(MODSRCS_DIR)/%.c
- $(COMPILE.c) $<
- $(CTFCONVERT_O)
-
-%.ln: $(MODSRCS_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
deleted file mode 100644
index 06c128a1f4..0000000000
--- a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include $(SRC)/Makefile.master
-
-MODULE = libpython$(PYTHON_VERSION).so
-MDBTGT = proc
-MODULE_NAME = libpython
-
-MODSRCS_DIR = ../../../common/modules/libpython
-
-MODSRCS = libpython.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.sparcv7
-include ../../../Makefile.module
-
-%.o := CPPFLAGS += $(PYCPPFLAGS)
-%.ln := CPPFLAGS += $(PYLNFLAGS)
-LINTFLAGS += -erroff=E_MACRO_REDEFINED
-
-dmod/$(MODULE) := LDLIBS += -lproc
-
-%.o: $(MODSRCS_DIR)/%.c
- $(COMPILE.c) $<
- $(CTFCONVERT_O)
-
-%.ln: $(MODSRCS_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/Makefile b/usr/src/cmd/mdb/sparc/v9/Makefile
index 74a0622f4b..944f39ea26 100644
--- a/usr/src/cmd/mdb/sparc/v9/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/Makefile
@@ -27,6 +27,7 @@ include ../../Makefile.common
MODULES = \
$(COMMON_MODULES_PROC) \
+ $(COMMON_MODULES_PROC_64BIT)
$(COMMON_MODULES_KVM) \
intr \
ssd
diff --git a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
index 79f47dd624..cd237fd5c1 100644
--- a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
@@ -25,7 +25,7 @@
include $(SRC)/Makefile.master
-MODULE = libpython$(PYTHON_VERSION).so
+MODULE = libpython$(PYTHON3_VERSION).so
MDBTGT = proc
MODULE_NAME = libpython
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-26 23:10:32 +0000