diff options
Diffstat (limited to '')
60 files changed, 252 insertions, 363 deletions
diff --git a/c/Makefile.in b/c/Makefile.in index d53908a4be..f0bf006d45 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -25,11 +25,7 @@ include $(RTEMS_ROOT)/make/directory.cfg SUB_DIRS=build-tools src -# We only make the install point for the KA9Q header files if it is enabled. -LIBKA9Q_yes_V = lib/include/ka9q -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - -# We only make the install point for the KA9Q header files if it is enabled. +# We only make the install point for the networking header files if needed. LIBNETWORKING_yes_V = lib/include/networking lib/include/networking/sys \ lib/include/networking/machine lib/include/networking/rtems \ lib/include/networking/vm lib/include/networking/net \ @@ -45,9 +41,8 @@ LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V) CREATE_DIRS = \ lib lib/include lib/include/sys lib/include/rtems \ lib/include/rtems/score lib/include/rtems/rtems lib/include/rtems/posix \ - lib/include/netinet lib/include/libc lib/include/libc/sys \ + lib/include/libc lib/include/libc/sys \ lib/include/motorola lib/include/zilog \ - $(LIBKA9Q) \ $(LIBNETWORKING) \ $(LIBRTEMSCPLUSPLUS) \ bin samples \ diff --git a/c/src/exec/libnetworking/arpa/inet.h b/c/src/exec/libnetworking/arpa/inet.h index fb95ee288a..ad5332e7ab 100644 --- a/c/src/exec/libnetworking/arpa/inet.h +++ b/c/src/exec/libnetworking/arpa/inet.h @@ -65,6 +65,7 @@ struct in_addr; +#if 0 /* RTEMS -- Why rename these? */ /* XXX all new diversions!! argh!! */ #define inet_addr __inet_addr #define inet_aton __inet_aton @@ -80,6 +81,7 @@ struct in_addr; #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa +#endif __BEGIN_DECLS int ascii2addr __P((int, const char *, void *)); diff --git a/c/src/exec/libnetworking/rtems/rtems_syscall.c b/c/src/exec/libnetworking/rtems/rtems_syscall.c index 794b8d3d8e..a526eb2254 100644 --- a/c/src/exec/libnetworking/rtems/rtems_syscall.c +++ b/c/src/exec/libnetworking/rtems/rtems_syscall.c @@ -617,8 +617,8 @@ getsockopt (int s, int level, int name, void *aval, int *avalsize) return 0; } -int -getpeername (int s, struct sockaddr *name, int *namelen) +static int +getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag) { struct socket *so; struct mbuf *m; @@ -636,7 +636,10 @@ getpeername (int s, struct sockaddr *name, int *namelen) rtems_bsdnet_semaphore_release (); return -1; } - error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + if (pflag) + error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + else + error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m); if (error) { errno = error; rtems_bsdnet_semaphore_release (); @@ -652,6 +655,17 @@ getpeername (int s, struct sockaddr *name, int *namelen) return 0; } +int +getpeername (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 1); +} +int +getsockname (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 0); +} + /* ************************************************************************ * RTEMS EXTERNAL I/O HANDLER ROUTINES * diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h index 7af6bebfad..1b6053912a 100644 --- a/c/src/exec/score/cpu/i386/cpu.h +++ b/c/src/exec/score/cpu/i386/cpu.h @@ -64,11 +64,23 @@ extern "C" { #define CPU_IDLE_TASK_IS_FP FALSE #define CPU_USE_DEFERRED_FP_SWITCH TRUE -#define CPU_PROVIDES_IDLE_THREAD_BODY TRUE #define CPU_STACK_GROWS_UP FALSE #define CPU_STRUCTURE_ALIGNMENT /* + * Does this port provide a CPU dependent IDLE task implementation? + * + * If TRUE, then the routine _CPU_Thread_Idle_body + * must be provided and is the default IDLE thread body instead of + * _CPU_Thread_Idle_body. + * + * If FALSE, then use the generic IDLE thread body if the BSP does + * not provide one. + */ + +#define CPU_PROVIDES_IDLE_THREAD_BODY TRUE + +/* * Define what is required to specify how the network to host conversion * routines are handled. */ @@ -385,6 +397,18 @@ void _CPU_ISR_install_vector( ); /* + * _CPU_Thread_Idle_body + * + * Use the halt instruction of low power mode of a particular i386 model. + */ + +#if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE) + +void _CPU_Thread_Idle_body( void ); + +#endif /* CPU_PROVIDES_IDLE_THREAD_BODY */ + +/* * _CPU_Context_switch * * This routine switches from the run context to the heir context. diff --git a/c/src/exec/score/headers/Makefile.in b/c/src/exec/score/headers/Makefile.in index 225f7e5bab..920e738c03 100644 --- a/c/src/exec/score/headers/Makefile.in +++ b/c/src/exec/score/headers/Makefile.in @@ -23,9 +23,6 @@ SAPI_H_FILES=$(SAPI_H_PIECES:%=$(srcdir)/%.h) EXTERNAL_H_PIECES = EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h) -NET_H_PIECES = in -NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h) - SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES) include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg @@ -44,5 +41,4 @@ CLOBBER_ADDITIONS += all: $(SRCS) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score $(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/ - $(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet # $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in index 225f7e5bab..920e738c03 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.in +++ b/c/src/exec/score/include/rtems/score/Makefile.in @@ -23,9 +23,6 @@ SAPI_H_FILES=$(SAPI_H_PIECES:%=$(srcdir)/%.h) EXTERNAL_H_PIECES = EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h) -NET_H_PIECES = in -NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h) - SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES) include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg @@ -44,5 +41,4 @@ CLOBBER_ADDITIONS += all: $(SRCS) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score $(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/ - $(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet # $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in index 7f71ba0b55..271ba5f8b7 100644 --- a/c/src/lib/Makefile.in +++ b/c/src/lib/Makefile.in @@ -11,10 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg -# We only build the KA9Q library if HAS_KA9Q was defined -LIBKA9Q_yes_V = libka9q -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - # We only build the networking library if HAS_NETWORKING was defined LIBNETWORKING_yes_V = libnetworking LIBNETWORKING = $(LIBNETWORKING_$(HAS_NETWORKING)_V) @@ -29,4 +25,4 @@ LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V) LIBHWAPI=$(wildcard libhwapi) SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc libc libcpu libbsp \ - $(LIBKA9Q) $(LIBNETWORKING) $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup + $(LIBNETWORKING) $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup diff --git a/c/src/lib/include/Makefile.in b/c/src/lib/include/Makefile.in index e6bf04b675..4d5aef8a89 100644 --- a/c/src/lib/include/Makefile.in +++ b/c/src/lib/include/Makefile.in @@ -15,14 +15,6 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h) SYS_H_PIECES=termios SYS_H_FILES=$(SYS_H_PIECES:%=$(srcdir)/sys/%.h) -KA9Q_H_PIECES= arp asy ax25 ax25mail bootp cmdparse commands config \ - daemon dialer domain enet ftp ftpcli global hardware icmp iface \ - internet ip kiss lapb lzw mailbox mbuf netuser nospc nr4 nr4mail \ - nrs ping pktdrvr ppp proc rip rtems_ka9q sb session slhc slip smtp \ - sockaddr SyslogDaemon syslog socket tcp telnet tftp timer tipmail \ - trace udp usock -KA9Q_H_FILES=$(KA9Q_H_PIECES:%=$(srcdir)/ka9q/%.h) - MOTOROLA_H_PIECES=mc68230 mc68681 MOTOROLA_H_FILES=$(MOTOROLA_H_PIECES:%=$(srcdir)/motorola/%.h) @@ -34,7 +26,7 @@ RTEMSCPLUSPLUS_H_PIECES= rtemsEvent rtemsInterrupt rtemsMessageQueue \ RTEMSCPLUSPLUS_H_FILES=$(RTEMSCPLUSPLUS_H_PIECES:%=$(srcdir)/rtems++/%.h) SRCS=$(H_FILES) $(SYS_H_FILES) \ - $(KA9Q_H_FILES) $(MOTOROLA_H_FILES) $(RTEMSCPLUSPLUS_H_FILES) + $(MOTOROLA_H_FILES) $(RTEMSCPLUSPLUS_H_FILES) include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg @@ -47,9 +39,6 @@ all: $(SRCS) $(INSTALL) -m 444 $(MOTOROLA_H_FILES) \ $(PROJECT_INCLUDE)/motorola $(INSTALL) -m 444 $(ZILOG_H_FILES) $(PROJECT_INCLUDE)/zilog -ifeq ($(HAS_KA9Q),yes) - $(INSTALL) -m 444 $(KA9Q_H_FILES) $(PROJECT_INCLUDE)/ka9q -endif ifeq ($(HAS_CPLUSPLUS),yes) $(INSTALL) -m 444 $(RTEMSCPLUSPLUS_H_FILES) $(PROJECT_INCLUDE)/rtems++ endif diff --git a/c/src/lib/libbsp/bare/README b/c/src/lib/libbsp/bare/README index 11362253b0..f2d43f974d 100644 --- a/c/src/lib/libbsp/bare/README +++ b/c/src/lib/libbsp/bare/README @@ -82,7 +82,7 @@ # --enable-gmake-print-directory \ # --disable-tests \ # --disable-posix \ -# --enable-ka9q \ +# --enable-networking \ # --enable-bare-cpu-cflags=-mcpu32 \ # --enable-bare-cpu-model=mcpu32 \ # --enable-rtemsbsp=bare diff --git a/c/src/lib/libbsp/bare/do-bare-bsp-build b/c/src/lib/libbsp/bare/do-bare-bsp-build index 6449756405..16da69e0fe 100644 --- a/c/src/lib/libbsp/bare/do-bare-bsp-build +++ b/c/src/lib/libbsp/bare/do-bare-bsp-build @@ -138,7 +138,7 @@ for cpu in ${CPUS}; do echo "Configuring RTEMS target bare-${rtems_target} ... " ../${RTEMS}/configure --target=${TARGET} --prefix=${RTEMS_PREFIX} \ --enable-cxx --enable-gmake-print-directory \ - --disable-tests --disable-posix --enable-ka9q \ + --disable-tests --disable-posix --enable-networking \ --enable-bare-cpu-cflags=-m${rtems_target} \ --enable-bare-cpu-model=m${rtems_target} \ --enable-rtemsbsp=bare diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in index 92963be422..4862454e13 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/Makefile.in @@ -11,9 +11,9 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg -# We only build the Network library if HAS_KA9Q was defined +# We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network -NETWORK = $(NETWORK_$(HAS_KA9Q)_V) +NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.in b/c/src/lib/libbsp/i386/pc386/include/Makefile.in index 0af71afba1..9dafa8662f 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.in @@ -8,9 +8,10 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only install wd80x3.h if HAS_KA9Q was defined -WD80X3_yes_V = $(srcdir)/wd80x3.h -WD80X3 = $(WD80X3_$(HAS_KA9Q)_V) +# This driver needs to be reworked for the BSD stack. +# # We only install wd80x3.h if HAS_NETWORKING was defined +# WD80X3_yes_V = $(srcdir)/wd80x3.h +# WD80X3 = $(WD80X3_$(HAS_NETWORKING)_V) H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/crt.h \ $(srcdir)/pc386uart.h $(srcdir)/pcibios.h \ diff --git a/c/src/lib/libbsp/i386/pc386/network/network.c b/c/src/lib/libbsp/i386/pc386/network/network.c index 2a13c6e514..639d2eb699 100644 --- a/c/src/lib/libbsp/i386/pc386/network/network.c +++ b/c/src/lib/libbsp/i386/pc386/network/network.c @@ -1,4 +1,6 @@ /* + * XXX This driver needs to be reworked to support the new BSD stack + * * RTEMS/KA9Q driver for WD8003 Ethernet Controller * * diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in index 93c14df9ed..70515fdb8e 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in @@ -8,9 +8,9 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only build the Network library if HAS_KA9Q was defined +# We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network -NETWORK = $(NETWORK_$(HAS_KA9Q)_V) +NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) BSP_PIECES=startup clock console timer pc386dev $(NETWORK) GENERIC_PIECES= diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 98cf93acef..b06c1fc69c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -13,10 +13,6 @@ include $(RTEMS_ROOT)/make/directory.cfg SRCS=README -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) @@ -26,4 +22,4 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories SUB_DIRS=include start360 startup clock console timer \ - $(KA9Q_DRIVER) $(NETWORKING_DRIVER) wrapup + $(NETWORKING_DRIVER) wrapup diff --git a/c/src/lib/libbsp/m68k/gen68360/README b/c/src/lib/libbsp/m68k/gen68360/README index 1a5ec2e667..8e14552641 100644 --- a/c/src/lib/libbsp/m68k/gen68360/README +++ b/c/src/lib/libbsp/m68k/gen68360/README @@ -33,7 +33,7 @@ # # Decisions to be made a link-edit time are: # - The size of the memory allocator heap. The default value is -# 64 kbytes. If the KA9Q network package is used the heap +# 64 kbytes. If the network package is used the heap # should be at least 256 kbytes. If your network is large, or # busy, the heap should be even larger. # To choose a heap size of 256 kbytes, diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index a52dc1e69c..885fdd117d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -37,6 +37,14 @@ extern "C" { #include <clockdrv.h> /* + * Network driver configuration + */ +struct rtems_bsdnet_ifconfig; +extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config); +#define RTEMS_BSP_NETWORK_DRIVER_NAME "scc1" +#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_scc1_driver_attach + +/* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These * values are in seconds and need to be converted to ticks for the diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index de02880710..c7523cd10f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in @@ -8,15 +8,11 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) -BSP_PIECES=startup clock console timer $(KA9Q_DRIVER) $(NETWORKING_DRIVER) +BSP_PIECES=startup clock console timer $(NETWORKING_DRIVER) CPU_PIECES= GENERIC_PIECES= diff --git a/c/src/lib/libnetworking/arpa/inet.h b/c/src/lib/libnetworking/arpa/inet.h index fb95ee288a..ad5332e7ab 100644 --- a/c/src/lib/libnetworking/arpa/inet.h +++ b/c/src/lib/libnetworking/arpa/inet.h @@ -65,6 +65,7 @@ struct in_addr; +#if 0 /* RTEMS -- Why rename these? */ /* XXX all new diversions!! argh!! */ #define inet_addr __inet_addr #define inet_aton __inet_aton @@ -80,6 +81,7 @@ struct in_addr; #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa +#endif __BEGIN_DECLS int ascii2addr __P((int, const char *, void *)); diff --git a/c/src/lib/libnetworking/rtems/rtems_syscall.c b/c/src/lib/libnetworking/rtems/rtems_syscall.c index 794b8d3d8e..a526eb2254 100644 --- a/c/src/lib/libnetworking/rtems/rtems_syscall.c +++ b/c/src/lib/libnetworking/rtems/rtems_syscall.c @@ -617,8 +617,8 @@ getsockopt (int s, int level, int name, void *aval, int *avalsize) return 0; } -int -getpeername (int s, struct sockaddr *name, int *namelen) +static int +getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag) { struct socket *so; struct mbuf *m; @@ -636,7 +636,10 @@ getpeername (int s, struct sockaddr *name, int *namelen) rtems_bsdnet_semaphore_release (); return -1; } - error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + if (pflag) + error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + else + error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m); if (error) { errno = error; rtems_bsdnet_semaphore_release (); @@ -652,6 +655,17 @@ getpeername (int s, struct sockaddr *name, int *namelen) return 0; } +int +getpeername (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 1); +} +int +getsockname (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 0); +} + /* ************************************************************************ * RTEMS EXTERNAL I/O HANDLER ROUTINES * diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in index 52042c5e6e..de322d9d04 100644 --- a/c/src/lib/wrapup/Makefile.in +++ b/c/src/lib/wrapup/Makefile.in @@ -18,7 +18,6 @@ LIB=$(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \ - $(wildcard $(PROJECT_RELEASE)/lib/libka9q$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \ diff --git a/c/src/libnetworking/arpa/inet.h b/c/src/libnetworking/arpa/inet.h index fb95ee288a..ad5332e7ab 100644 --- a/c/src/libnetworking/arpa/inet.h +++ b/c/src/libnetworking/arpa/inet.h @@ -65,6 +65,7 @@ struct in_addr; +#if 0 /* RTEMS -- Why rename these? */ /* XXX all new diversions!! argh!! */ #define inet_addr __inet_addr #define inet_aton __inet_aton @@ -80,6 +81,7 @@ struct in_addr; #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa +#endif __BEGIN_DECLS int ascii2addr __P((int, const char *, void *)); diff --git a/c/src/libnetworking/rtems/rtems_syscall.c b/c/src/libnetworking/rtems/rtems_syscall.c index 794b8d3d8e..a526eb2254 100644 --- a/c/src/libnetworking/rtems/rtems_syscall.c +++ b/c/src/libnetworking/rtems/rtems_syscall.c @@ -617,8 +617,8 @@ getsockopt (int s, int level, int name, void *aval, int *avalsize) return 0; } -int -getpeername (int s, struct sockaddr *name, int *namelen) +static int +getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag) { struct socket *so; struct mbuf *m; @@ -636,7 +636,10 @@ getpeername (int s, struct sockaddr *name, int *namelen) rtems_bsdnet_semaphore_release (); return -1; } - error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + if (pflag) + error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + else + error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m); if (error) { errno = error; rtems_bsdnet_semaphore_release (); @@ -652,6 +655,17 @@ getpeername (int s, struct sockaddr *name, int *namelen) return 0; } +int +getpeername (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 1); +} +int +getsockname (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 0); +} + /* ************************************************************************ * RTEMS EXTERNAL I/O HANDLER ROUTINES * diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index ee533743e8..61449f3f16 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/make/compilers/gcc-target-default.cfg @@ -18,10 +18,6 @@ CPLUS_CPPFLAGS=$(CFLAGS) $(XCPPFLAGS) # default flags -# We only include the header files for KA9Q if it is enabled. -INCLUDE_KA9Q_yes_V = -I$(PROJECT_INCLUDE)/ka9q -INCLUDE_KA9Q = $(INCLUDE_KA9Q_$(HAS_KA9Q)_V) - # We only include the header files for networking if it is enabled. INCLUDE_NETWORKING_yes_V = -I$(PROJECT_INCLUDE)/networking INCLUDE_NETWORKING = $(INCLUDE_NETWORKING_$(HAS_NETWORKING)_V) @@ -36,7 +32,6 @@ endif # Used for posix bsps CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -I$(PROJECT_INCLUDE) \ - $(INCLUDE_KA9Q) \ $(INCLUDE_NETWORKING) \ $(RTEMS_LIBC_INCLUDES) $(DEFINES) @@ -50,7 +45,6 @@ GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -nostdinc -I$(PROJECT_INCLUDE) \ - $(INCLUDE_KA9Q) \ $(INCLUDE_NETWORKING) \ -I$(RTEMS_LIBC_DIR)/include -I$(GCC_INCLUDE) $(DEFINES) @@ -71,7 +65,7 @@ endif else CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems \ - $(INCLUDE_KA9Q) $(INCLUDE_NETWORKING) $(DEFINES) + $(INCLUDE_NETWORKING) $(DEFINES) ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g -I$(srcdir) \ -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems $(DEFINES) diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in index 52042c5e6e..de322d9d04 100644 --- a/c/src/wrapup/Makefile.in +++ b/c/src/wrapup/Makefile.in @@ -18,7 +18,6 @@ LIB=$(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \ - $(wildcard $(PROJECT_RELEASE)/lib/libka9q$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \ @@ -21,9 +21,6 @@ ac_help="$ac_help --enable-posix enable posix interface" ac_help="$ac_help \ - --enable-ka9q enable KA9Q TCP/IP stack" -ac_help="$ac_help -\ --enable-networking enable TCP/IP stack" ac_help="$ac_help \ @@ -561,7 +558,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:565: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:562: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -634,7 +631,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:638: checking host system type" >&5 +echo "configure:635: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -655,7 +652,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:659: checking target system type" >&5 +echo "configure:656: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -673,7 +670,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:677: checking build system type" >&5 +echo "configure:674: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -731,20 +728,6 @@ else fi -# Check whether --enable-ka9q or --disable-ka9q was given. -if test "${enable_ka9q+set}" = set; then - enableval="$enable_ka9q" - \ -case "${enableval}" in - yes) RTEMS_HAS_KA9Q=yes ;; - no) RTEMS_HAS_KA9Q=no ;; - *) { echo "configure: error: bad value ${enableval} for enable-ka9q option" 1>&2; exit 1; } ;; -esac -else - RTEMS_HAS_KA9Q=no -fi - - # Check whether --enable-networking or --disable-networking was given. if test "${enable_networking+set}" = set; then enableval="$enable_networking" @@ -840,7 +823,7 @@ RTEMS_PREFIX=${target_cpu}-${target_vendor} # Extract the first word of "cat", so it can be a program name with args. set dummy cat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:844: checking for $ac_word" >&5 +echo "configure:827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +854,7 @@ fi # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:875: checking for $ac_word" >&5 +echo "configure:858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -902,7 +885,7 @@ fi # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:906: checking for $ac_word" >&5 +echo "configure:889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -933,7 +916,7 @@ fi # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:937: checking for $ac_word" >&5 +echo "configure:920: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -964,7 +947,7 @@ fi # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:968: checking for $ac_word" >&5 +echo "configure:951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -993,7 +976,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:997: checking whether ln -s works" >&5 +echo "configure:980: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1016,7 +999,7 @@ fi # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1020: checking for $ac_word" >&5 +echo "configure:1003: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1047,7 +1030,7 @@ fi # Extract the first word of "sort", so it can be a program name with args. set dummy sort; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1051: checking for $ac_word" >&5 +echo "configure:1034: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SORT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1086,7 +1069,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1090: checking for a BSD compatible install" >&5 +echo "configure:1073: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1139,7 +1122,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1143: checking for $ac_word" >&5 +echo "configure:1126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1171,7 +1154,7 @@ fi echo $ac_n "checking for working $MKDIR -m 0755""... $ac_c" 1>&6 -echo "configure:1175: checking for working $MKDIR -m 0755" >&5 +echo "configure:1158: checking for working $MKDIR -m 0755" >&5 if eval "test \"`echo '$''{'rtems_cv_prog_MKDIR_P'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1188,7 +1171,7 @@ echo "$ac_t""$rtems_cv_prog_MKDIR_M" 1>&6 echo $ac_n "checking for working $MKDIR -p""... $ac_c" 1>&6 -echo "configure:1192: checking for working $MKDIR -p" >&5 +echo "configure:1175: checking for working $MKDIR -p" >&5 if eval "test \"`echo '$''{'rtems_cv_prog_mkdir_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1208,7 +1191,7 @@ test "$rtems_cv_prog_MKDIR_P" = "yes" && MKDIR="$MKDIR -p" # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1212: checking for $ac_word" >&5 +echo "configure:1195: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1239,7 +1222,7 @@ fi # Extract the first word of "cmp", so it can be a program name with args. set dummy cmp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1243: checking for $ac_word" >&5 +echo "configure:1226: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1254,7 @@ fi # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1275: checking for $ac_word" >&5 +echo "configure:1258: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1304,7 +1287,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1308: checking for $ac_word" >&5 +echo "configure:1291: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1341,7 +1324,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1345: checking for $ac_word" >&5 +echo "configure:1328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1419,7 +1402,7 @@ case "${target}" in ;; *) echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:1423: checking rtems target cpu" >&5 +echo "configure:1406: checking rtems target cpu" >&5 target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` echo "$ac_t""$target_cpu" 1>&6 @@ -1438,7 +1421,7 @@ fi # Is this a supported CPU? echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6 -echo "configure:1442: checking if cpu $target_cpu is supported" >&5 +echo "configure:1425: checking if cpu $target_cpu is supported" >&5 if test -d "$srcdir/c/src/exec/score/cpu/$target_cpu"; then echo "$ac_t""yes" 1>&6 makefiles="$makefiles c/src/exec/score/cpu/$target_cpu/Makefile" @@ -1463,7 +1446,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1467: checking for $ac_word" >&5 +echo "configure:1450: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1503,7 +1486,7 @@ rtems_save_CFLAGS=$CFLAGS CC=$CC_FOR_TARGET echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1507: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1490: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1513,11 +1496,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 1517 "configure" +#line 1500 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1537,12 +1520,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1541: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1524: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1546: checking whether we are using GNU C" >&5 +echo "configure:1529: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1551,7 +1534,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1566,7 +1549,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1570: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1553: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1608,7 +1591,7 @@ unset ac_cv_prog_cc_cross echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6 -echo "configure:1612: checking whether $CC_FOR_TARGET accepts -specs" >&5 +echo "configure:1595: checking whether $CC_FOR_TARGET accepts -specs" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1629,7 +1612,7 @@ echo "$ac_t""$rtems_cv_gcc_specs" 1>&6 echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6 -echo "configure:1633: checking whether $CC_FOR_TARGET accepts --pipe" >&5 +echo "configure:1616: checking whether $CC_FOR_TARGET accepts --pipe" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1670,7 +1653,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1674: checking for $ac_word" >&5 +echo "configure:1657: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1710,7 +1693,7 @@ rtems_save_CXXFLAGS=$CXXFLAGS CXX=$CXX_FOR_TARGET echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1714: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1697: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1720,11 +1703,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 1724 "configure" +#line 1707 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1750,12 +1733,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1754: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1737: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1759: checking whether we are using GNU C++" >&5 +echo "configure:1742: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1764,7 +1747,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1779,7 +1762,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1783: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1766: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1833,7 +1816,7 @@ fi echo $ac_n "checking target's ar""... $ac_c" 1>&6 -echo "configure:1837: checking target's ar" >&5 +echo "configure:1820: checking target's ar" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1866,7 +1849,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1870: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 +echo "configure:1853: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 case "$AR_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1883,7 +1866,7 @@ echo "configure:1870: checking whether environment variable AR_FOR_TARGET is an # Extract the first word of ""$program_prefix"ar", so it can be a program name with args. set dummy "$program_prefix"ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1887: checking for $ac_word" >&5 +echo "configure:1870: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1916,7 +1899,7 @@ fi echo $ac_n "checking target's as""... $ac_c" 1>&6 -echo "configure:1920: checking target's as" >&5 +echo "configure:1903: checking target's as" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1949,7 +1932,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1953: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 +echo "configure:1936: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 case "$AS_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1966,7 +1949,7 @@ echo "configure:1953: checking whether environment variable AS_FOR_TARGET is an # Extract the first word of ""$program_prefix"as", so it can be a program name with args. set dummy "$program_prefix"as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1970: checking for $ac_word" >&5 +echo "configure:1953: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1999,7 +1982,7 @@ fi echo $ac_n "checking target's ld""... $ac_c" 1>&6 -echo "configure:2003: checking target's ld" >&5 +echo "configure:1986: checking target's ld" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2032,7 +2015,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2036: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 +echo "configure:2019: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 case "$LD_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2049,7 +2032,7 @@ echo "configure:2036: checking whether environment variable LD_FOR_TARGET is an # Extract the first word of ""$program_prefix"ld", so it can be a program name with args. set dummy "$program_prefix"ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2053: checking for $ac_word" >&5 +echo "configure:2036: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,7 +2065,7 @@ fi echo $ac_n "checking target's nm""... $ac_c" 1>&6 -echo "configure:2086: checking target's nm" >&5 +echo "configure:2069: checking target's nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2115,7 +2098,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2119: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 +echo "configure:2102: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 case "$NM_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2132,7 +2115,7 @@ echo "configure:2119: checking whether environment variable NM_FOR_TARGET is an # Extract the first word of ""$program_prefix"nm", so it can be a program name with args. set dummy "$program_prefix"nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2136: checking for $ac_word" >&5 +echo "configure:2119: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2166,7 +2149,7 @@ fi echo $ac_n "checking target's ranlib""... $ac_c" 1>&6 -echo "configure:2170: checking target's ranlib" >&5 +echo "configure:2153: checking target's ranlib" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2199,7 +2182,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2203: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 +echo "configure:2186: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 case "$RANLIB_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2216,7 +2199,7 @@ echo "configure:2203: checking whether environment variable RANLIB_FOR_TARGET is # Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args. set dummy "$program_prefix"ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2220: checking for $ac_word" >&5 +echo "configure:2203: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2251,7 +2234,7 @@ fi # ranlib wasn't found; check if ar -s is available echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6 -echo "configure:2255: checking whether $AR_FOR_TARGET -s works" >&5 +echo "configure:2238: checking whether $AR_FOR_TARGET -s works" >&5 if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2260,8 +2243,8 @@ cat > conftest.$ac_ext <<EOF int foo( int b ) { return b; } EOF -if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ - && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ +if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ + && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ && test -s conftest.a ; \ then rtems_cv_AR_FOR_TARGET_S="yes" @@ -2286,7 +2269,7 @@ echo "$ac_t""$rtems_cv_AR_FOR_TARGET_S" 1>&6 echo $ac_n "checking target's objcopy""... $ac_c" 1>&6 -echo "configure:2290: checking target's objcopy" >&5 +echo "configure:2273: checking target's objcopy" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2319,7 +2302,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2323: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 +echo "configure:2306: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 case "$OBJCOPY_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2336,7 +2319,7 @@ echo "configure:2323: checking whether environment variable OBJCOPY_FOR_TARGET i # Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args. set dummy "$program_prefix"objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2340: checking for $ac_word" >&5 +echo "configure:2323: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2369,7 +2352,7 @@ fi echo $ac_n "checking target's size""... $ac_c" 1>&6 -echo "configure:2373: checking target's size" >&5 +echo "configure:2356: checking target's size" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2402,7 +2385,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2406: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 +echo "configure:2389: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 case "$SIZE_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2419,7 +2402,7 @@ echo "configure:2406: checking whether environment variable SIZE_FOR_TARGET is a # Extract the first word of ""$program_prefix"size", so it can be a program name with args. set dummy "$program_prefix"size; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2423: checking for $ac_word" >&5 +echo "configure:2406: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2455,7 +2438,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2459: checking for $ac_word" >&5 +echo "configure:2442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2484,7 +2467,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2488: checking for $ac_word" >&5 +echo "configure:2471: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2532,7 +2515,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2536: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2519: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2542,11 +2525,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2546 "configure" +#line 2529 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2566,12 +2549,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2570: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2553: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2575: checking whether we are using GNU C" >&5 +echo "configure:2558: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2580,7 +2563,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2595,7 +2578,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2599: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2582: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2624,19 +2607,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:2628: checking for Cygwin32 environment" >&5 +echo "configure:2611: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'rtems_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2633 "configure" +#line 2616 "configure" #include "confdefs.h" int main() { return __CYGWIN32__; ; return 0; } EOF -if { (eval echo configure:2640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rtems_cv_cygwin32=yes else @@ -2654,7 +2637,7 @@ CYGWIN32= test "$rtems_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2658: checking for executable suffix" >&5 +echo "configure:2641: checking for executable suffix" >&5 if eval "test \"`echo '$''{'rtems_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2687,12 +2670,12 @@ esac for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2691: checking for $ac_func" >&5 +echo "configure:2674: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2696 "configure" +#line 2679 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2715,7 +2698,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2744,7 +2727,7 @@ if test "$target_cpu" = "unix" ; then echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6 -echo "configure:2748: checking whether $RTEMS_HOST supports System V semaphores" >&5 +echo "configure:2731: checking whether $RTEMS_HOST supports System V semaphores" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2753,7 +2736,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2757 "configure" +#line 2740 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2779,7 +2762,7 @@ int main () { } EOF -if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_sem="yes" else @@ -2802,7 +2785,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6 -echo "configure:2806: checking whether $RTEMS_HOST supports System V shared memory" >&5 +echo "configure:2789: checking whether $RTEMS_HOST supports System V shared memory" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2811,7 +2794,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2815 "configure" +#line 2798 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2827,7 +2810,7 @@ int main () { } EOF -if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_shm="yes" else @@ -2850,7 +2833,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6 -echo "configure:2854: checking whether $RTEMS_HOST supports System V messages" >&5 +echo "configure:2837: checking whether $RTEMS_HOST supports System V messages" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2859,7 +2842,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2863 "configure" +#line 2846 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2875,7 +2858,7 @@ int main () { } EOF -if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_msg="yes" else @@ -2900,7 +2883,7 @@ fi # find all the Executive Makefiles echo $ac_n "checking for Makefile.in in c/src/exec/score/tools/$target_cpu""... $ac_c" 1>&6 -echo "configure:2904: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5 +echo "configure:2887: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5 if test -d $srcdir/c/src/exec/score/tools/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2915,7 +2898,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6 -echo "configure:2919: checking for Makefile.in in c/src/exec/rtems" >&5 +echo "configure:2902: checking for Makefile.in in c/src/exec/rtems" >&5 if test -d $srcdir/c/src/exec/rtems; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2930,7 +2913,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6 -echo "configure:2934: checking for Makefile.in in c/src/exec/sapi" >&5 +echo "configure:2917: checking for Makefile.in in c/src/exec/sapi" >&5 if test -d $srcdir/c/src/exec/sapi; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2947,7 +2930,7 @@ fi if test "$RTEMS_HAS_POSIX_API" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6 -echo "configure:2951: checking for Makefile.in in c/src/exec/posix" >&5 +echo "configure:2934: checking for Makefile.in in c/src/exec/posix" >&5 if test -d $srcdir/c/src/exec/posix; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2969,7 +2952,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then if test -z "$rtems_bsp"; then echo $ac_n "checking for bsps""... $ac_c" 1>&6 -echo "configure:2973: checking for bsps" >&5 +echo "configure:2956: checking for bsps" >&5 files=`ls $srcdir/c/src/lib/libbsp/$target_cpu` for file in $files; do case $file in @@ -3034,7 +3017,7 @@ echo "configure:2973: checking for bsps" >&5 bspdirs="$bspdirs $bspdir" echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6 -echo "configure:3038: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5 +echo "configure:3021: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5 if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3049,7 +3032,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6 -echo "configure:3053: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5 +echo "configure:3036: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5 if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3072,7 +3055,7 @@ fi # find all the CPU dependent library Makefiles echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6 -echo "configure:3076: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5 +echo "configure:3059: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5 if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3089,7 +3072,7 @@ fi if test "$skip_startfiles" != "yes"; then echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6 -echo "configure:3093: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5 +echo "configure:3076: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5 if test -d $srcdir/c/src/lib/start/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3119,22 +3102,14 @@ else inline_dir=inline fi -# If the KA9Q TCP/IP stack is enabled, then find all KA9Q Makefiles -echo $ac_n "checking if KA9Q networking is enabled? ""... $ac_c" 1>&6 -echo "configure:3125: checking if KA9Q networking is enabled? " >&5 -echo "$ac_t""$RTEMS_HAS_KA9Q" 1>&6 -if test "$RTEMS_HAS_KA9Q" = "yes"; then - makefiles="$makefiles c/src/lib/libka9q/Makefile" -fi - # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6 -echo "configure:3133: checking if networking is enabled? " >&5 +echo "configure:3108: checking if networking is enabled? " >&5 echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6 if test "$RTEMS_HAS_NETWORKING" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/lib/libnetworking""... $ac_c" 1>&6 -echo "configure:3138: checking for Makefile.in in c/src/lib/libnetworking" >&5 +echo "configure:3113: checking for Makefile.in in c/src/lib/libnetworking" >&5 if test -d $srcdir/c/src/lib/libnetworking; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3156,7 +3131,7 @@ fi # If the tests are enabled, then find all the test suite Makefiles echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6 -echo "configure:3160: checking if the test suites are enabled? " >&5 +echo "configure:3135: checking if the test suites are enabled? " >&5 tests_enabled=yes # Check whether --enable-tests or --disable-tests was given. if test "${enable_tests+set}" = set; then @@ -3175,7 +3150,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6 -echo "configure:3179: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 +echo "configure:3154: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 if test -d $srcdir/c/src/tests/tools/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3192,7 +3167,7 @@ fi if test "$tests_enabled" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6 -echo "configure:3196: checking for Makefile.in in c/src/tests/libtests" >&5 +echo "configure:3171: checking for Makefile.in in c/src/tests/libtests" >&5 if test -d $srcdir/c/src/tests/libtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3207,7 +3182,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6 -echo "configure:3211: checking for Makefile.in in c/src/tests/sptests" >&5 +echo "configure:3186: checking for Makefile.in in c/src/tests/sptests" >&5 if test -d $srcdir/c/src/tests/sptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3222,7 +3197,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6 -echo "configure:3226: checking for Makefile.in in c/src/tests/tmtests" >&5 +echo "configure:3201: checking for Makefile.in in c/src/tests/tmtests" >&5 if test -d $srcdir/c/src/tests/tmtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3237,7 +3212,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6 -echo "configure:3241: checking for Makefile.in in c/src/tests/mptests" >&5 +echo "configure:3216: checking for Makefile.in in c/src/tests/mptests" >&5 if test -d $srcdir/c/src/tests/mptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3253,7 +3228,7 @@ fi if test "$RTEMS_HAS_POSIX_API" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6 -echo "configure:3257: checking for Makefile.in in c/src/tests/psxtests" >&5 +echo "configure:3232: checking for Makefile.in in c/src/tests/psxtests" >&5 if test -d $srcdir/c/src/tests/psxtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3271,7 +3246,7 @@ fi # If the HWAPI is enabled, the find the HWAPI Makefiles echo $ac_n "checking if the HWAPI is enabled? ""... $ac_c" 1>&6 -echo "configure:3275: checking if the HWAPI is enabled? " >&5 +echo "configure:3250: checking if the HWAPI is enabled? " >&5 # Check whether --enable-hwapi or --disable-hwapi was given. if test "${enable_hwapi+set}" = set; then enableval="$enable_hwapi" @@ -3282,7 +3257,7 @@ if test "${enable_hwapi+set}" = set; then makefiles="$makefiles c/src/lib/libhwapi/Makefile" echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6 -echo "configure:3286: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 +echo "configure:3261: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 if test -d $srcdir/c/src/lib/libhwapi/analog; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3297,7 +3272,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6 -echo "configure:3301: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 +echo "configure:3276: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 if test -d $srcdir/c/src/lib/libhwapi/discrete; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3312,7 +3287,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6 -echo "configure:3316: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 +echo "configure:3291: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 if test -d $srcdir/c/src/lib/libhwapi/drivers; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3327,7 +3302,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6 -echo "configure:3331: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 +echo "configure:3306: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3342,7 +3317,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6 -echo "configure:3346: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 +echo "configure:3321: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 if test -d $srcdir/c/src/lib/libhwapi/serial; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3357,7 +3332,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6 -echo "configure:3361: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 +echo "configure:3336: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 if test -d $srcdir/c/src/lib/libhwapi/support; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3372,7 +3347,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6 -echo "configure:3376: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 +echo "configure:3351: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3414,11 +3389,10 @@ fi - # pick up all the Makefiles in required parts of the tree echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6 -echo "configure:3422: checking for Makefile.in in c/build-tools" >&5 +echo "configure:3396: checking for Makefile.in in c/build-tools" >&5 if test -d $srcdir/c/build-tools; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3433,7 +3407,7 @@ fi echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6 -echo "configure:3437: checking for Makefile.in in make" >&5 +echo "configure:3411: checking for Makefile.in in make" >&5 if test -d $srcdir/make; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3448,7 +3422,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6 -echo "configure:3452: checking for Makefile.in in c/src/lib/libmisc" >&5 +echo "configure:3426: checking for Makefile.in in c/src/lib/libmisc" >&5 if test -d $srcdir/c/src/lib/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3463,7 +3437,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6 -echo "configure:3467: checking for Makefile.in in c/src/tests/samples" >&5 +echo "configure:3441: checking for Makefile.in in c/src/tests/samples" >&5 if test -d $srcdir/c/src/tests/samples; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3694,7 +3668,6 @@ s%@RTEMS_HOST@%$RTEMS_HOST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_USE_OWN_PDIR@%$RTEMS_USE_OWN_PDIR%g s%@RTEMS_HAS_POSIX_API@%$RTEMS_HAS_POSIX_API%g -s%@RTEMS_HAS_KA9Q@%$RTEMS_HAS_KA9Q%g s%@RTEMS_HAS_NETWORKING@%$RTEMS_HAS_NETWORKING%g s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g diff --git a/configure.in b/configure.in index 774f32f10f..1ee614dedd 100644 --- a/configure.in +++ b/configure.in @@ -27,14 +27,6 @@ AC_ARG_ENABLE(posix, \ *) AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;; esac],[RTEMS_HAS_POSIX_API=yes]) -AC_ARG_ENABLE(ka9q, \ -[ --enable-ka9q enable KA9Q TCP/IP stack], \ -[case "${enableval}" in - yes) RTEMS_HAS_KA9Q=yes ;; - no) RTEMS_HAS_KA9Q=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for enable-ka9q option) ;; -esac],[RTEMS_HAS_KA9Q=no]) - AC_ARG_ENABLE(networking, \ [ --enable-networking enable TCP/IP stack], \ [case "${enableval}" in @@ -379,13 +371,6 @@ else inline_dir=inline fi -# If the KA9Q TCP/IP stack is enabled, then find all KA9Q Makefiles -AC_MSG_CHECKING([if KA9Q networking is enabled? ]) -AC_MSG_RESULT($RTEMS_HAS_KA9Q) -if test "$RTEMS_HAS_KA9Q" = "yes"; then - makefiles="$makefiles c/src/lib/libka9q/Makefile" -fi - # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles AC_MSG_CHECKING([if networking is enabled? ]) AC_MSG_RESULT($RTEMS_HAS_NETWORKING) @@ -454,7 +439,6 @@ AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_LIBC_DIR) AC_SUBST(RTEMS_USE_OWN_PDIR) AC_SUBST(RTEMS_HAS_POSIX_API) -AC_SUBST(RTEMS_HAS_KA9Q) AC_SUBST(RTEMS_HAS_NETWORKING) AC_SUBST(RTEMS_USE_MACROS) AC_SUBST(RTEMS_HAS_CPLUSPLUS) diff --git a/cpukit/libnetworking/arpa/inet.h b/cpukit/libnetworking/arpa/inet.h index fb95ee288a..ad5332e7ab 100644 --- a/cpukit/libnetworking/arpa/inet.h +++ b/cpukit/libnetworking/arpa/inet.h @@ -65,6 +65,7 @@ struct in_addr; +#if 0 /* RTEMS -- Why rename these? */ /* XXX all new diversions!! argh!! */ #define inet_addr __inet_addr #define inet_aton __inet_aton @@ -80,6 +81,7 @@ struct in_addr; #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa +#endif __BEGIN_DECLS int ascii2addr __P((int, const char *, void *)); diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c index 794b8d3d8e..a526eb2254 100644 --- a/cpukit/libnetworking/rtems/rtems_syscall.c +++ b/cpukit/libnetworking/rtems/rtems_syscall.c @@ -617,8 +617,8 @@ getsockopt (int s, int level, int name, void *aval, int *avalsize) return 0; } -int -getpeername (int s, struct sockaddr *name, int *namelen) +static int +getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag) { struct socket *so; struct mbuf *m; @@ -636,7 +636,10 @@ getpeername (int s, struct sockaddr *name, int *namelen) rtems_bsdnet_semaphore_release (); return -1; } - error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + if (pflag) + error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m); + else + error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m); if (error) { errno = error; rtems_bsdnet_semaphore_release (); @@ -652,6 +655,17 @@ getpeername (int s, struct sockaddr *name, int *namelen) return 0; } +int +getpeername (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 1); +} +int +getsockname (int s, struct sockaddr *name, int *namelen) +{ + return getpeersockname (s, name, namelen, 0); +} + /* ************************************************************************ * RTEMS EXTERNAL I/O HANDLER ROUTINES * diff --git a/make/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in index b2b0ec4ba5..c64b785dd5 100644 --- a/make/Templates/Makefile.inc.in +++ b/make/Templates/Makefile.inc.in @@ -34,7 +34,6 @@ RTEMS_CUSTOM = $(prefix)/rtems/make/custom/$(RTEMS_BSP).cfg PROJECT_ROOT = $(prefix)/rtems/ RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@ RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ -RTEMS_HAS_KA9Q = @RTEMS_HAS_KA9Q@ RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@ diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index ee533743e8..61449f3f16 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -18,10 +18,6 @@ CPLUS_CPPFLAGS=$(CFLAGS) $(XCPPFLAGS) # default flags -# We only include the header files for KA9Q if it is enabled. -INCLUDE_KA9Q_yes_V = -I$(PROJECT_INCLUDE)/ka9q -INCLUDE_KA9Q = $(INCLUDE_KA9Q_$(HAS_KA9Q)_V) - # We only include the header files for networking if it is enabled. INCLUDE_NETWORKING_yes_V = -I$(PROJECT_INCLUDE)/networking INCLUDE_NETWORKING = $(INCLUDE_NETWORKING_$(HAS_NETWORKING)_V) @@ -36,7 +32,6 @@ endif # Used for posix bsps CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -I$(PROJECT_INCLUDE) \ - $(INCLUDE_KA9Q) \ $(INCLUDE_NETWORKING) \ $(RTEMS_LIBC_INCLUDES) $(DEFINES) @@ -50,7 +45,6 @@ GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -nostdinc -I$(PROJECT_INCLUDE) \ - $(INCLUDE_KA9Q) \ $(INCLUDE_NETWORKING) \ -I$(RTEMS_LIBC_DIR)/include -I$(GCC_INCLUDE) $(DEFINES) @@ -71,7 +65,7 @@ endif else CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \ -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems \ - $(INCLUDE_KA9Q) $(INCLUDE_NETWORKING) $(DEFINES) + $(INCLUDE_NETWORKING) $(DEFINES) ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g -I$(srcdir) \ -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems $(DEFINES) diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg index 3dd9b6499e..76af11b358 100644 --- a/make/custom/FreeBSD-posix.cfg +++ b/make/custom/FreeBSD-posix.cfg @@ -40,10 +40,6 @@ endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg index d054bc370a..333c238701 100644 --- a/make/custom/HPUX9-posix.cfg +++ b/make/custom/HPUX9-posix.cfg @@ -39,10 +39,6 @@ LIBC_DEFINES += -DHEAPSPACE_MB=1 # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index c50daf9006..fc4a33efea 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -41,10 +41,6 @@ endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index 34eb6264d8..370e7c3e73 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -40,10 +40,6 @@ endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/cvme961.cfg b/make/custom/cvme961.cfg index 6513ed1441..a868c79964 100644 --- a/make/custom/cvme961.cfg +++ b/make/custom/cvme961.cfg @@ -28,10 +28,6 @@ CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/default.cfg b/make/custom/default.cfg index 980b73cf5b..e96c1e21fa 100644 --- a/make/custom/default.cfg +++ b/make/custom/default.cfg @@ -60,13 +60,6 @@ endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=no -# Define this to yes if this target wants the KA9Q TCP/IP stack -ifeq ($(RTEMS_HAS_KA9Q),yes) -HAS_KA9Q=yes -else -HAS_KA9Q=no -endif - # Define this to yes if this target wants the TCP/IP stack ifeq ($(RTEMS_HAS_NETWORKING),yes) HAS_NETWORKING=yes diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index c8337e15a3..357a84b21c 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -23,10 +23,6 @@ CPU_CFLAGS = # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/efi332.cfg b/make/custom/efi332.cfg index cc4c1b50f4..e985ef14e0 100644 --- a/make/custom/efi332.cfg +++ b/make/custom/efi332.cfg @@ -22,10 +22,6 @@ CPU_CFLAGS = -m68020 # optimize flag: typically -0, could use -O4 or -fast, -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index 09c15910d6..0e84355337 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -21,10 +21,6 @@ CPU_CFLAGS = -m68000 -msoft-float # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg index 2e0a27595c..8fdedfedb3 100644 --- a/make/custom/erc32.cfg +++ b/make/custom/erc32.cfg @@ -28,10 +28,6 @@ endif # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/force386.cfg b/make/custom/force386.cfg index 6fce969131..89e7532e10 100644 --- a/make/custom/force386.cfg +++ b/make/custom/force386.cfg @@ -24,10 +24,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/gen68302.cfg b/make/custom/gen68302.cfg index ef4293e053..b72fea3fb0 100644 --- a/make/custom/gen68302.cfg +++ b/make/custom/gen68302.cfg @@ -22,10 +22,6 @@ CPU_CFLAGS=-m68302 -msoft-float # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg index 38eb59db15..4f538f72c7 100644 --- a/make/custom/gensh1.cfg +++ b/make/custom/gensh1.cfg @@ -31,10 +31,6 @@ RTEMS_USE_NEWLIB=yes # Define this to yes if this target supports multiprocessor environments. HAS_MP=no -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/go32.cfg b/make/custom/go32.cfg index e8708d6a03..0c4078368a 100644 --- a/make/custom/go32.cfg +++ b/make/custom/go32.cfg @@ -53,10 +53,6 @@ endif # i486dx # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index bedf6bd107..d7c0421ac1 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -21,10 +21,6 @@ CPU_CFLAGS = # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg index 1ffac2e85d..0d853906f4 100644 --- a/make/custom/idp.cfg +++ b/make/custom/idp.cfg @@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=m68ec040 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=idp -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg index 17ecd7bf24..019ddabbb9 100644 --- a/make/custom/mvme136.cfg +++ b/make/custom/mvme136.cfg @@ -25,10 +25,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg index 092b4890ee..c63fd9891c 100644 --- a/make/custom/mvme147.cfg +++ b/make/custom/mvme147.cfg @@ -19,10 +19,6 @@ CPU_CFLAGS= # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index d3c55c2a75..9141517008 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -46,10 +46,6 @@ endif # mc68lc040 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/no_bsp.cfg b/make/custom/no_bsp.cfg index 83937a06f4..d4ef58fad9 100644 --- a/make/custom/no_bsp.cfg +++ b/make/custom/no_bsp.cfg @@ -27,10 +27,6 @@ HAS_CPLUSPLUS=no # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg index 0988c53a04..bb24d9b97a 100644 --- a/make/custom/ods68302.cfg +++ b/make/custom/ods68302.cfg @@ -32,10 +32,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # debugging please CFLAGS_DEBUG_V+=-g -# This target does not support the ka9q tcp/ip stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/p4000.cfg b/make/custom/p4000.cfg index 298c443249..d036013511 100644 --- a/make/custom/p4000.cfg +++ b/make/custom/p4000.cfg @@ -12,10 +12,6 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=p4000 -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/p4600.cfg b/make/custom/p4600.cfg index 527e6cada9..8f77c8c2af 100644 --- a/make/custom/p4600.cfg +++ b/make/custom/p4600.cfg @@ -25,10 +25,6 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 TARGET_ARCH=o-p4600 RTEMS_BSP=p4000 -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/p4650.cfg b/make/custom/p4650.cfg index e249fb2870..d076faa6ec 100644 --- a/make/custom/p4650.cfg +++ b/make/custom/p4650.cfg @@ -24,10 +24,6 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 TARGET_ARCH=o-p4650 RTEMS_BSP=p4000 -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/papyrus.cfg b/make/custom/papyrus.cfg index 10f4cf0368..9086732cf8 100644 --- a/make/custom/papyrus.cfg +++ b/make/custom/papyrus.cfg @@ -16,10 +16,6 @@ RTEMS_BSP_FAMILY=papyrus #CPU_DEFINES=-DPPC_ABI=PPC_ABI_POWEROPEN \ # -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x0100 -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/portsw.cfg b/make/custom/portsw.cfg index 6669819dd2..e083530894 100644 --- a/make/custom/portsw.cfg +++ b/make/custom/portsw.cfg @@ -52,10 +52,6 @@ HAS_CPLUSPLUS=no # Define this to yes if this target supports multiprocessor environments. HAS_MP=no -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg index 7a7f2fef17..d91c149c4e 100644 --- a/make/custom/psim.cfg +++ b/make/custom/psim.cfg @@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=ppc603e # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=psim -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no @@ -89,9 +85,9 @@ CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions # Define this to yes if this target supports multiprocessor environments. HAS_MP=no -# This target does not support the ka9q tcp/ip stack so ignore requests +# This target does not support the TCP/IP stack so ignore requests # to enable it. -HAS_KA9Q=no +HAS_NETWORKING=no # The following is a linkcmds file which will work without using the # -specs system in gcc 2.8. diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg index 43674ea40d..6a7f022336 100644 --- a/make/custom/simhppa.cfg +++ b/make/custom/simhppa.cfg @@ -38,10 +38,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes -# This target does NOT support the KA9Q TCP/IP stack so ignore requests -# to enable it. -HAS_KA9Q=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/target.cfg.in b/make/target.cfg.in index 01f3ae1a72..88f369c88e 100644 --- a/make/target.cfg.in +++ b/make/target.cfg.in @@ -39,7 +39,6 @@ RTEMS_CROSS_TARGET=@rtems_cv_prog_cc_cross@ RTEMS_HOST = @RTEMS_HOST@ RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@ RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ -RTEMS_HAS_KA9Q = @RTEMS_HAS_KA9Q@ RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ |