Skip to content

Commit 7271a81

Browse files
committed
build: remove CONFIG_LIBDECNUMBER
It is used by all PPC targets; we can give the directory its own Makefile.objs file, and include it directly from target/ppc. target/s390 can do the same when it starts using it. Signed-off-by: Paolo Bonzini <[email protected]>
1 parent eb584b4 commit 7271a81

10 files changed

+6
-13
lines changed

Makefile.target

-6
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ obj-y += target/$(TARGET_BASE_ARCH)/
102102
obj-y += disas.o
103103
obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
104104

105-
obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o
106-
obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o
107-
obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal32.o
108-
obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal64.o
109-
obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal128.o
110-
111105
#########################################################
112106
# Linux user emulator target
113107

default-configs/ppc-linux-user.mak

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# Default configuration for ppc-linux-user
2-
CONFIG_LIBDECNUMBER=y

default-configs/ppc-softmmu.mak

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ CONFIG_E500=y
4646
CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
4747
CONFIG_PLATFORM_BUS=y
4848
CONFIG_ETSEC=y
49-
CONFIG_LIBDECNUMBER=y
5049
CONFIG_SM501=y
5150
# For PReP
5251
CONFIG_SERIAL_ISA=y

default-configs/ppc64-linux-user.mak

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# Default configuration for ppc64-linux-user
2-
CONFIG_LIBDECNUMBER=y

default-configs/ppc64-softmmu.mak

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ CONFIG_E500=y
5151
CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
5252
CONFIG_PLATFORM_BUS=y
5353
CONFIG_ETSEC=y
54-
CONFIG_LIBDECNUMBER=y
5554
CONFIG_SM501=y
5655
# For pSeries
5756
CONFIG_XICS=$(CONFIG_PSERIES)
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# Default configuration for ppc64abi32-linux-user
2-
CONFIG_LIBDECNUMBER=y
-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# Default configuration for ppc64le-linux-user
2-
CONFIG_LIBDECNUMBER=y

default-configs/ppcemb-softmmu.mak

-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ CONFIG_PTIMER=y
1515
CONFIG_I8259=y
1616
CONFIG_XILINX=y
1717
CONFIG_XILINX_ETHLITE=y
18-
CONFIG_LIBDECNUMBER=y
1918
CONFIG_SM501=y

libdecnumber/Makefile.objs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
obj-y += decContext.o
2+
obj-y += decNumber.o
3+
obj-y += dpd/decimal32.o
4+
obj-y += dpd/decimal64.o
5+
obj-y += dpd/decimal128.o

target/ppc/Makefile.objs

+1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ obj-y += int_helper.o
1515
obj-y += timebase_helper.o
1616
obj-y += misc_helper.o
1717
obj-y += mem_helper.o
18+
obj-y += ../../libdecnumber/
1819
obj-$(CONFIG_USER_ONLY) += user_only_helper.o
1920
obj-y += gdbstub.o

0 commit comments

Comments
 (0)