mirror of
https://github.com/paulusmack/ppp.git
synced 2024-11-23 18:33:24 +08:00
A couple of fixes:
a) 64-bit compilation flags were insufficient. Additional ones were added so that the generated binaries are correct (64-bit relocation issues). b) Cleaned up some lint flags.
This commit is contained in:
Adi Masputra
parent
a08a6f3080
commit
ec6acd10d0
@ -1,21 +1,22 @@
|
||||
#
|
||||
# Makefile for pppd under Solaris 2.
|
||||
# $Id: Makefile.sol2,v 1.13 1999/09/16 01:16:59 masputra Exp $
|
||||
# $Id: Makefile.sol2,v 1.14 1999/09/21 20:37:20 masputra Exp $
|
||||
#
|
||||
|
||||
include ../svr4/Makedefs
|
||||
|
||||
CFLAGS = -DSVR4 -DSOL2 -I../include $(COPTS)
|
||||
COPTS += -xO2 -xspace -W0,-Lt
|
||||
CFLAGS = -I../include -DSVR4 -DSOL2 $(COPTS)
|
||||
LIBS = -lsocket -lnsl
|
||||
|
||||
OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o \
|
||||
OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o \
|
||||
ccp.o auth.o options.o demand.o utils.o sys-svr4.o
|
||||
|
||||
#
|
||||
# uncomment the following to enable plugins
|
||||
#
|
||||
CFLAGS += -DPLUGIN
|
||||
LIBS += -ldl
|
||||
CFLAGS += -DPLUGIN
|
||||
LIBS += -ldl
|
||||
|
||||
#
|
||||
# Make targets
|
||||
|
||||
@ -1,62 +1,59 @@
|
||||
#
|
||||
# Generic make definitions for Solaris 2
|
||||
#
|
||||
# $Id: Makedefs.sol2,v 1.2 1999/09/15 23:51:56 masputra Exp $
|
||||
# $Id: Makedefs.sol2,v 1.3 1999/09/21 20:37:20 masputra Exp $
|
||||
#
|
||||
|
||||
include Makedefs
|
||||
include ../svr4/Makedefs
|
||||
|
||||
CPPFLAGS = -D_KERNEL -DSVR4 -DSOL2 -I../include -DPRIOQ -DDEBUG
|
||||
CPPFLAGS = -D_KERNEL -DSVR4 -DSOL2 -DPRIOQ -DDEBUG -I../include
|
||||
CFLAGS = $(CPPFLAGS) $(COPTS)
|
||||
|
||||
# lint-specific variables
|
||||
LINT = lint
|
||||
LINT32OPT =
|
||||
LINT64OPT = -Xarch=v9 -errchk=longptr64
|
||||
LINT_OPT_32 =
|
||||
LINT_OPT_64 = -Xarch=v9 -errchk=longptr64
|
||||
|
||||
LINTTAGS_32 =
|
||||
LINTTAGS_32 += -erroff=E_BAD_PTR_CAST_ALIGN
|
||||
LINTTAGS_32 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
|
||||
LINTTAGS_32 += -erroff=E_SUSPICIOUS_COMPARISON
|
||||
LINTTAGS_32 += -erroff=E_CAST_UINT_TO_SIGNED_INT
|
||||
LINTTAGS_32 += -erroff=E_PASS_UINT_TO_SIGNED_INT
|
||||
LINTTAGS_32 += -erroff=E_INVALID_ANNOTATION_NAME
|
||||
LINTTAGS_32 += -erroff=E_FUNC_ARG_UNUSED
|
||||
LINT_32 =
|
||||
LINT_32 += -erroff=E_BAD_PTR_CAST_ALIGN
|
||||
LINT_32 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
|
||||
LINT_32 += -erroff=E_SUSPICIOUS_COMPARISON
|
||||
LINT_32 += -erroff=E_CAST_UINT_TO_SIGNED_INT
|
||||
LINT_32 += -erroff=E_PASS_UINT_TO_SIGNED_INT
|
||||
LINT_32 += -erroff=E_INVALID_ANNOTATION_NAME
|
||||
LINT_32 += -erroff=E_FUNC_ARG_UNUSED
|
||||
# This might be needed, but zlib.c and vjcompress.c will squawk
|
||||
# when not ignored
|
||||
LINTTAGS_32 += -erroff=E_CASE_FALLTHRU
|
||||
LINTTAGS_32 += -erroff=E_RET_INT_IMPLICITLY
|
||||
LINTTAGS_32 += -erroff=E_FUNC_NO_RET_VAL
|
||||
LINT_32 += -erroff=E_CASE_FALLTHRU
|
||||
LINT_32 += -erroff=E_RET_INT_IMPLICITLY
|
||||
LINT_32 += -erroff=E_FUNC_NO_RET_VAL
|
||||
# Some STREAMS macros will be noisy too when this isn't ignored
|
||||
LINTTAGS_32 += -erroff=E_CONSTANT_CONDITION
|
||||
LINTTAGS_32 += -erroff=E_CONST_EXPR
|
||||
LINT_32 += -erroff=E_CONSTANT_CONDITION
|
||||
LINT_32 += -erroff=E_CONST_EXPR
|
||||
|
||||
# Selectively disable certain noisy lint errors
|
||||
LENIENT_LINTTAGS =
|
||||
LENIENT_LINTTAGS += -erroff=E_CAST_INT_TO_SMALL_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_CAST_INT_CONST_TO_SMALL_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_CAST_TO_PTR_FROM_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_ASSIGN_INT_TO_SMALL_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_ASSIGN_INT_FROM_BIG_CONST
|
||||
LENIENT_LINTTAGS += -erroff=E_CONST_PROMOTED_UNSIGNED_LL
|
||||
LENIENT_LINTTAGS += -erroff=E_CONST_PROMOTED_LONG_LONG
|
||||
LENIENT_LINTTAGS += -erroff=E_CONST_TRUNCATED_BY_ASSIGN
|
||||
LENIENT_LINTTAGS += -erroff=E_PASS_INT_FROM_BIG_CONST
|
||||
LENIENT_LINTTAGS += -erroff=E_COMP_INT_WITH_LARGE_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_ASSIGN_UINT_TO_SIGNED_INT
|
||||
# These last three are still noisy but a bit more useful.
|
||||
# They shouldn't be used on new code.
|
||||
LENIENT_LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
|
||||
LENIENT_LINTTAGS += -erroff=E_PASS_INT_TO_SMALL_INT
|
||||
LENIENT_LINTTAGS += -erroff=E_PTR_CONV_LOSES_BITS
|
||||
# Extra noise suppressant for 64-bit
|
||||
EXTRA_OFF =
|
||||
EXTRA_OFF += -erroff=E_CAST_INT_TO_SMALL_INT
|
||||
EXTRA_OFF += -erroff=E_CAST_INT_CONST_TO_SMALL_INT
|
||||
EXTRA_OFF += -erroff=E_CAST_TO_PTR_FROM_INT
|
||||
EXTRA_OFF += -erroff=E_ASSIGN_INT_TO_SMALL_INT
|
||||
EXTRA_OFF += -erroff=E_ASSIGN_INT_FROM_BIG_CONST
|
||||
EXTRA_OFF += -erroff=E_CONST_PROMOTED_UNSIGNED_LL
|
||||
EXTRA_OFF += -erroff=E_CONST_PROMOTED_LONG_LONG
|
||||
EXTRA_OFF += -erroff=E_CONST_TRUNCATED_BY_ASSIGN
|
||||
EXTRA_OFF += -erroff=E_PASS_INT_FROM_BIG_CONST
|
||||
EXTRA_OFF += -erroff=E_COMP_INT_WITH_LARGE_INT
|
||||
EXTRA_OFF += -erroff=E_ASSIGN_UINT_TO_SIGNED_INT
|
||||
EXTRA_OFF += -erroff=E_ASSIGN_NARROW_CONV
|
||||
EXTRA_OFF += -erroff=E_PASS_INT_TO_SMALL_INT
|
||||
EXTRA_OFF += -erroff=E_PTR_CONV_LOSES_BITS
|
||||
|
||||
LINTTAGS_64 = $(LINTTAGS_32)
|
||||
# comment out next line to turn on pedantic 64-bit error checking
|
||||
LINTTAGS_64 += $(LENIENT_LINTTAGS)
|
||||
LINT_64 = $(LINT_32)
|
||||
LINT_64 += $(EXTRA_OFF)
|
||||
|
||||
LINTFLAGS64 = -Xa -nsxmuF -errtags=yes $(LINT64OPT) $(LINTTAGS_64)
|
||||
LINT64.c = $(LINT) -c $(LINTFLAGS64) $(CPPFLAGS)
|
||||
LINTFLAGS64 = -Xa -nsxmuF -errtags=yes $(LINT_OPT_64) $(LINT_64)
|
||||
LINT64 = $(LINT) -c $(LINTFLAGS64) $(CPPFLAGS)
|
||||
|
||||
LINTFLAGS32 = -Xa -nsxmuF -errtags=yes $(LINT32OPT) $(LINTTAGS_32)
|
||||
LINT32.c = $(LINT) -c $(LINTFLAGS32) $(CPPFLAGS)
|
||||
LINTFLAGS32 = -Xa -nsxmuF -errtags=yes $(LINT_OPT_32) $(LINT_32)
|
||||
LINT32 = $(LINT) -c $(LINTFLAGS32) $(CPPFLAGS)
|
||||
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
#
|
||||
# Makefile for STREAMS modules for Solaris 2.
|
||||
#
|
||||
# $Id: Makefile.sol2,v 1.17 1999/09/15 23:51:56 masputra Exp $
|
||||
# $Id: Makefile.sol2,v 1.18 1999/09/21 20:37:20 masputra Exp $
|
||||
#
|
||||
|
||||
include Makedefs.sol2
|
||||
|
||||
COPTS += -xO2 -xspace -W0,-Lt
|
||||
|
||||
COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
|
||||
ppp_comp_mod.o
|
||||
|
||||
@ -57,7 +59,7 @@ SRCS = ../modules/ppp.c ppp_mod.c ../modules/ppp_ahdlc.c ppp_ahdlc_mod.c \
|
||||
../common/zlib.c ../modules/vjcompress.c ppp_comp_mod.c
|
||||
|
||||
lint:
|
||||
$(LINT32.c) $(SRCS)
|
||||
$(LINT32) $(SRCS)
|
||||
|
||||
clean:
|
||||
rm -f ppp ppp_comp ppp_ahdl *.o *~ core
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
#
|
||||
# Makefile for 64-bit STREAMS modules for Solaris 2.
|
||||
#
|
||||
# $Id: Makefile.sol2-64,v 1.2 1999/09/15 22:10:16 masputra Exp $
|
||||
# $Id: Makefile.sol2-64,v 1.3 1999/09/21 20:37:20 masputra Exp $
|
||||
#
|
||||
|
||||
include Makedefs.sol2
|
||||
|
||||
# Sun's cc flag for LP64 compilation / linkage
|
||||
COPTS += -xarch=v9
|
||||
COPTS += -xchip=ultra -xarch=v9 -Wc,-xcode=abs32 -Wc,-Qiselect-regsym=0 -xO3 -xspace -W0,-Lt
|
||||
|
||||
# subdirectory where 64-bit objects / binaries will be placed
|
||||
LP64DIR = sparcv9
|
||||
@ -75,10 +75,10 @@ SRCS = ../modules/ppp.c ppp_mod.c ../modules/ppp_ahdlc.c ppp_ahdlc_mod.c \
|
||||
../common/zlib.c ../modules/vjcompress.c ppp_comp_mod.c
|
||||
|
||||
lint:
|
||||
$(LINT64.c) $(SRCS)
|
||||
$(LINT64) $(SRCS)
|
||||
|
||||
lint-32:
|
||||
$(LINT32.c) $(SRCS)
|
||||
$(LINT32) $(SRCS)
|
||||
|
||||
clean:
|
||||
$(MAKE) -f $(STD_MAKE) clean
|
||||
|
||||
Loading…
Reference in New Issue
Block a user