diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libm1 | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libm1')
| -rw-r--r-- | usr/src/lib/libm1/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libm1/Makefile.com | 16 | ||||
| -rw-r--r-- | usr/src/lib/libm1/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libm1/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libm1/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libm1/sparcv9/Makefile | 2 |
6 files changed, 14 insertions, 15 deletions
diff --git a/usr/src/lib/libm1/Makefile b/usr/src/lib/libm1/Makefile index cb351e34cb..28518c2175 100644 --- a/usr/src/lib/libm1/Makefile +++ b/usr/src/lib/libm1/Makefile @@ -19,20 +19,19 @@ VERS= .1 # include common library definitions include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/libm1/Makefile.com b/usr/src/lib/libm1/Makefile.com index c97b92c957..5672bea95b 100644 --- a/usr/src/lib/libm1/Makefile.com +++ b/usr/src/lib/libm1/Makefile.com @@ -14,8 +14,8 @@ # -LIBRARY = libm.a -VERS = .1 +LIBRARY = libm.a +VERS = .1 LIBMDIR = $(SRC)/lib/libm @@ -23,19 +23,19 @@ OBJECTS = libmv1.o include $(SRC)/lib/Makefile.lib include $(SRC)/lib/Makefile.rootfs -include $(LIBMDIR)/Makefile.libm.com +include $(LIBMDIR)/Makefile.libm.com -LIBS = $(DYNLIB) +LIBS = $(DYNLIB) SRCS = $(OBJECTS:%.o=../common/%.c) SRCDIR = ../common/ CPPFLAGS += -DLIBM_BUILD MAPFILEDIR = ../common/ -DYNFLAGS += -zignore -Wl,-F'libm.so.2' -LINTFLAGS64 += -errchk=longptr64 +DYNFLAGS += -zignore -Wl,-F'libm.so.2' + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) .KEEP_STATE: all: $(LIBS) - -lint: lintcheck diff --git a/usr/src/lib/libm1/amd64/Makefile b/usr/src/lib/libm1/amd64/Makefile index 21fab0dd1c..00367a883c 100644 --- a/usr/src/lib/libm1/amd64/Makefile +++ b/usr/src/lib/libm1/amd64/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/i386/Makefile b/usr/src/lib/libm1/i386/Makefile index 3d2c71860a..3b1f60dcde 100644 --- a/usr/src/lib/libm1/i386/Makefile +++ b/usr/src/lib/libm1/i386/Makefile @@ -16,6 +16,6 @@ TARGET_ARCH= i386 include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparc/Makefile b/usr/src/lib/libm1/sparc/Makefile index 686bb12ef2..867aeaa331 100644 --- a/usr/src/lib/libm1/sparc/Makefile +++ b/usr/src/lib/libm1/sparc/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= sparc include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparcv9/Makefile b/usr/src/lib/libm1/sparcv9/Makefile index 4899efe7b7..cf688d8ba6 100644 --- a/usr/src/lib/libm1/sparcv9/Makefile +++ b/usr/src/lib/libm1/sparcv9/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= sparcv9 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ |