f6877ab8d5
to build the kernel. It doesn't affect the operation if gcc.
Most of the changes are just adding __INTEL_COMPILER to #ifdef's, as
icc v8 may define __GNUC__ some parts may look strange but are
necessary.
Additional changes:
- in_cksum.[ch]:
* use a generic C version instead of the assembly version in the !gcc
case (ASM code breaks with the optimizations icc does)
-> no bad checksums with an icc compiled kernel
Help from: andre, grehan, das
Stolen from: alpha version via ppc version
The entire checksum code should IMHO be replaced with the DragonFly
version (because it isn't guaranteed future revisions of gcc will
include similar optimizations) as in:
---snip---
Revision Changes Path
1.12 +1 -0 src/sys/conf/files.i386
1.4 +142 -558 src/sys/i386/i386/in_cksum.c
1.5 +33 -69 src/sys/i386/include/in_cksum.h
1.5 +2 -0 src/sys/netinet/igmp.c
1.6 +0 -1 src/sys/netinet/in.h
1.6 +2 -0 src/sys/netinet/ip_icmp.c
1.4 +3 -4 src/contrib/ipfilter/ip_compat.h
1.3 +1 -2 src/sbin/natd/icmp.c
1.4 +0 -1 src/sbin/natd/natd.c
1.48 +1 -0 src/sys/conf/files
1.2 +0 -1 src/sys/conf/files.amd64
1.13 +0 -1 src/sys/conf/files.i386
1.5 +0 -1 src/sys/conf/files.pc98
1.7 +1 -1 src/sys/contrib/ipfilter/netinet/fil.c
1.10 +2 -3 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.10 +1 -1 src/sys/contrib/ipfilter/netinet/ip_fil.c
1.7 +1 -1 src/sys/dev/netif/txp/if_txp.c
1.7 +1 -1 src/sys/net/ip_mroute/ip_mroute.c
1.7 +1 -2 src/sys/net/ipfw/ip_fw2.c
1.6 +1 -2 src/sys/netinet/igmp.c
1.4 +158 -116 src/sys/netinet/in_cksum.c
1.6 +1 -1 src/sys/netinet/ip_gre.c
1.7 +1 -2 src/sys/netinet/ip_icmp.c
1.10 +1 -1 src/sys/netinet/ip_input.c
1.10 +1 -2 src/sys/netinet/ip_output.c
1.13 +1 -2 src/sys/netinet/tcp_input.c
1.9 +1 -2 src/sys/netinet/tcp_output.c
1.10 +1 -1 src/sys/netinet/tcp_subr.c
1.10 +1 -1 src/sys/netinet/tcp_syncache.c
1.9 +1 -2 src/sys/netinet/udp_usrreq.c
1.5 +1 -2 src/sys/netinet6/ipsec.c
1.5 +1 -2 src/sys/netproto/ipsec/ipsec.c
1.5 +1 -1 src/sys/netproto/ipsec/ipsec_input.c
1.4 +1 -2 src/sys/netproto/ipsec/ipsec_output.c
and finally remove
sys/i386/i386 in_cksum.c
sys/i386/include in_cksum.h
---snip---
- endian.h:
* DTRT in C++ mode
- quad.h:
* we don't use gcc v1 anymore, remove support for it
Suggested by: bde (long ago)
- assym.h:
* avoid zero-length arrays (remove dependency on a gcc specific
feature)
This change changes the contents of the object file, but as it's
only used to generate some values for a header, and the generator
knows how to handle this, there's no impact in the gcc case.
Explained by: bde
Submitted by: Marius Strobl <marius@alchemy.franken.de>
- aicasm.c:
* minor change to teach it about the way icc spells "-nostdinc"
Not approved by: gibbs (no reply to my mail)
- bump __FreeBSD_version (lang/icc needs to know about the changes)
Incarnations of this patch survive gcc compiles since a loooong time,
I use it on my desktop. An icc compiled kernel works since Nov. 2003
(exceptions: snd_* if used as modules), it survives a build of the
entire ports collection with icc.
Parts of this commit contains suggestions or submissions from
Marius Strobl <marius@alchemy.franken.de>.
Reviewed by: -arch
Submitted by: netchild
94 lines
3.3 KiB
C
94 lines
3.3 KiB
C
/*-
|
|
* Copyright (c) 1999 John D. Polstra
|
|
* Copyright (c) 1999,2001 Peter Wemm <peter@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _SYS_LINKER_SET_H_
|
|
#define _SYS_LINKER_SET_H_
|
|
|
|
/*
|
|
* The following macros are used to declare global sets of objects, which
|
|
* are collected by the linker into a `linker_set' as defined below.
|
|
* For ELF, this is done by constructing a separate segment for each set.
|
|
*/
|
|
|
|
/*
|
|
* Private macros, not to be used outside this header file.
|
|
*/
|
|
#if defined(__GNUC__) || defined(__INTEL_COMPILER)
|
|
#define __MAKE_SET(set, sym) \
|
|
static void const * const __set_##set##_sym_##sym \
|
|
__section("set_" #set) __unused = &sym
|
|
#else /* !(__GNUC__ || __INTEL_COMPILER) */
|
|
#ifndef lint
|
|
#error "This file needs to be compiled by GCC, an Intel compiler or lint"
|
|
#endif /* lint */
|
|
#define __MAKE_SET(set, sym) extern void const * const (__set_##set##_sym_##sym)
|
|
#endif /* __GNUC__ || __INTEL_COMPILER */
|
|
|
|
/*
|
|
* Public macros.
|
|
*/
|
|
#define TEXT_SET(set, sym) __MAKE_SET(set, sym)
|
|
#define DATA_SET(set, sym) __MAKE_SET(set, sym)
|
|
#define BSS_SET(set, sym) __MAKE_SET(set, sym)
|
|
#define ABS_SET(set, sym) __MAKE_SET(set, sym)
|
|
#define SET_ENTRY(set, sym) __MAKE_SET(set, sym)
|
|
|
|
/*
|
|
* Initialize before referring to a give linker set
|
|
*/
|
|
#define SET_DECLARE(set, ptype) \
|
|
extern ptype *__CONCAT(__start_set_,set); \
|
|
extern ptype *__CONCAT(__stop_set_,set)
|
|
|
|
#define SET_BEGIN(set) \
|
|
(&__CONCAT(__start_set_,set))
|
|
#define SET_LIMIT(set) \
|
|
(&__CONCAT(__stop_set_,set))
|
|
|
|
/*
|
|
* Iterate over all the elements of a set.
|
|
*
|
|
* Sets always contain addresses of things, and "pvar" points to words
|
|
* containing those addresses. Thus is must be declared as "type **pvar",
|
|
* and the address of each set item is obtained inside the loop by "*pvar".
|
|
*/
|
|
#define SET_FOREACH(pvar, set) \
|
|
for (pvar = SET_BEGIN(set); pvar < SET_LIMIT(set); pvar++)
|
|
|
|
#define SET_ITEM(set, i) \
|
|
((SET_BEGIN(set))[i])
|
|
|
|
/*
|
|
* Provide a count of the items in a set.
|
|
*/
|
|
#define SET_COUNT(set) \
|
|
(SET_LIMIT(set) - SET_BEGIN(set))
|
|
|
|
#endif /* _SYS_LINKER_SET_H_ */
|