tech-toolchain archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Moving GCC headers
Hi all,
the attached patch moves the MD GCC headers into a version specific
subdirectory. This files change depending on which version of GCC is
used and are also not 100% compatible with clang. This allows more
peaceful coexistance of different compilers. Commments?
Joerg
Index: src/distrib/sets/lists/base/mi
===================================================================
--- src/distrib/sets/lists/base/mi
+++ src/distrib/sets/lists/base/mi
@@ -793,10 +793,11 @@
./usr/include/g++/debug base-cxx-usr
./usr/include/g++/ext base-cxx-usr
./usr/include/g++/gen base-obsolete obsolete
./usr/include/g++/std base-cxx-usr
./usr/include/g++/tr1 base-cxx-usr
+./usr/include/gcc-4.1 base-c-usr
./usr/include/gssapi base-c-usr
./usr/include/gssapi/rpc base-obsolete obsolete
./usr/include/dev/pci/hdaudio base-c-usr
./usr/include/isofs base-c-usr
./usr/include/isofs/cd9660 base-c-usr
Index: src/distrib/sets/lists/comp/ad.powerpc
===================================================================
--- src/distrib/sets/lists/comp/ad.powerpc
+++ src/distrib/sets/lists/comp/ad.powerpc
@@ -1,9 +1,10 @@
# $NetBSD: ad.powerpc,v 1.47 2010/03/14 09:52:00 mrg Exp $
./usr/bin/elf2aout comp-sysutil-bin
./usr/bin/psim comp-debug-bin
gdb,gdb=6
-./usr/include/altivec.h comp-c-include
gcccmds
+./usr/include/altivec.h comp-obsolete
obsolete
+./usr/include/gcc-4.1/altivec.h comp-c-include
gcccmds,gcc=4
./usr/include/powerpc comp-c-include
./usr/include/powerpc/ansi.h comp-c-include
./usr/include/powerpc/aout_machdep.h comp-c-include
./usr/include/powerpc/asm.h comp-c-include
./usr/include/powerpc/atomic.h comp-c-include
Index: src/distrib/sets/lists/comp/md.amd64
===================================================================
--- src/distrib/sets/lists/comp/md.amd64
+++ src/distrib/sets/lists/comp/md.amd64
@@ -65,11 +65,16 @@
./usr/include/amd64/types.h comp-c-include
./usr/include/amd64/userret.h comp-c-include
./usr/include/amd64/varargs.h comp-c-include
./usr/include/amd64/vmparam.h comp-c-include
./usr/include/amd64/wchar_limits.h comp-c-include
-./usr/include/emmintrin.h comp-c-include gcccmds
+./usr/include/emmintrin.h comp-obsolete obsolete
+./usr/include/gcc-4.1/emmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/mm_malloc.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/mmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/pmmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/xmmintrin.h comp-c-include
gcccmds,gcc=4
./usr/include/i386 comp-c-include
./usr/include/i386/ansi.h comp-c-include
./usr/include/i386/aout_machdep.h comp-c-include
./usr/include/i386/apmvar.h comp-c-include
./usr/include/i386/asm.h comp-c-include
@@ -137,13 +142,13 @@
./usr/include/i386/varargs.h comp-c-include
./usr/include/i386/vm86.h comp-c-include
./usr/include/i386/vmparam.h comp-c-include
./usr/include/i386/wchar_limits.h comp-c-include
./usr/include/ieeefp.h comp-c-include
-./usr/include/mm_malloc.h comp-c-include
gcccmds,gcc=4
-./usr/include/mmintrin.h comp-c-include gcccmds
-./usr/include/pmmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/mm_malloc.h comp-obsolete obsolete
+./usr/include/mmintrin.h comp-obsolete obsolete
+./usr/include/pmmintrin.h comp-obsolete obsolete
./usr/include/x64_64 comp-obsolete obsolete
./usr/include/x64_64/ansi.h comp-obsolete obsolete
./usr/include/x64_64/aout_machdep.h comp-obsolete obsolete
./usr/include/x64_64/asm.h comp-obsolete obsolete
./usr/include/x64_64/bootinfo.h comp-obsolete
obsolete
@@ -230,11 +235,11 @@
./usr/include/x86/trap.h comp-c-include
./usr/include/x86/via_padlock.h comp-c-include
./usr/include/xen comp-c-include
./usr/include/xen/xenio.h comp-c-include
./usr/include/xen/xenio3.h comp-c-include
-./usr/include/xmmintrin.h comp-c-include gcccmds
+./usr/include/xmmintrin.h comp-obsolete obsolete
./usr/lib/i386/crt0.o comp-c-lib compat
./usr/lib/i386/crtbegin.o comp-c-lib compat
./usr/lib/i386/crtbeginS.o comp-c-lib
compat,pic
./usr/lib/i386/crtbeginT.o comp-c-lib
compat,pic
./usr/lib/i386/crtend.o comp-c-lib
compat
Index: src/distrib/sets/lists/comp/md.i386
===================================================================
--- src/distrib/sets/lists/comp/md.i386
+++ src/distrib/sets/lists/comp/md.i386
@@ -1,7 +1,12 @@
# $NetBSD: md.i386,v 1.115 2010/12/20 04:29:29 christos Exp $
-./usr/include/emmintrin.h comp-c-include gcccmds
+./usr/include/emmintrin.h comp-obsolete obsolete
+./usr/include/gcc-4.1/emmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/mmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/mm_malloc.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/pmmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/gcc-4.1/xmmintrin.h comp-c-include
gcccmds,gcc=4
./usr/include/i386 comp-c-include
./usr/include/i386/_G_config.h comp-obsolete obsolete
./usr/include/i386/ansi.h comp-c-include
./usr/include/i386/aout_machdep.h comp-c-include
./usr/include/i386/apmvar.h comp-c-include
@@ -77,14 +82,14 @@
./usr/include/i386/varargs.h comp-c-include
./usr/include/i386/vm86.h comp-c-include
./usr/include/i386/vmparam.h comp-c-include
./usr/include/i386/wchar_limits.h comp-c-include
./usr/include/ieeefp.h comp-c-include
-./usr/include/mmintrin.h comp-c-include gcccmds
-./usr/include/mm_malloc.h comp-c-include
gcccmds,gcc=4
+./usr/include/mmintrin.h comp-obsolete obsolete
+./usr/include/mm_malloc.h comp-obsolete obsolete
./usr/include/pmc.h comp-c-include
-./usr/include/pmmintrin.h comp-c-include
gcccmds,gcc=4
+./usr/include/pmmintrin.h comp-obsolete obsolete
./usr/include/x86 comp-c-include
./usr/include/x86/aout_machdep.h comp-c-include
./usr/include/x86/autoconf.h comp-obsolete obsolete
./usr/include/x86/bootinfo.h comp-c-include
./usr/include/x86/bus.h comp-c-include
@@ -112,11 +117,11 @@
./usr/include/x86/trap.h comp-c-include
./usr/include/x86/via_padlock.h comp-c-include
./usr/include/xen comp-c-include
./usr/include/xen/xenio.h comp-c-include
./usr/include/xen/xenio3.h comp-c-include
-./usr/include/xmmintrin.h comp-c-include gcccmds
+./usr/include/xmmintrin.h comp-obsolete obsolete
./usr/lib/libi386.a comp-c-lib
./usr/lib/libi386_g.a -unknown- debuglib
./usr/lib/libi386_p.a comp-c-proflib profile
./usr/lib/libi386_pic.a comp-c-piclib
pic
./usr/lib/libm387.a comp-c-lib
Index: src/etc/mtree/NetBSD.dist.base
===================================================================
--- src/etc/mtree/NetBSD.dist.base
+++ src/etc/mtree/NetBSD.dist.base
@@ -124,10 +124,11 @@
./usr/include/g++/backward
./usr/include/g++/ext
./usr/include/g++/bits
./usr/include/g++/tr1
./usr/include/g++/debug
+./usr/include/gcc-4.1
./usr/include/gssapi
./usr/include/isofs
./usr/include/isofs/cd9660
./usr/include/kadm5
./usr/include/krb5
Index: src/gnu/dist/gcc4/gcc/config/netbsd.h
===================================================================
--- src/gnu/dist/gcc4/gcc/config/netbsd.h
+++ src/gnu/dist/gcc4/gcc/config/netbsd.h
@@ -58,18 +58,19 @@
#undef GPLUSPLUS_BACKWARD_INCLUDE_DIR
#define GPLUSPLUS_BACKWARD_INCLUDE_DIR "/usr/include/g++/backward"
#undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-4.1"
#undef INCLUDE_DEFAULTS
#define INCLUDE_DEFAULTS \
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1 }, \
{ GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1 }, \
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 1 }, \
+ { "/usr/include", "GCC", 0, 0, 1 }, \
{ 0, 0, 0, 0 } \
}
/* Under NetBSD, the normal location of the various *crt*.o files is the
/usr/lib directory. */
Index: src/gnu/usr.bin/gcc4/include/Makefile
===================================================================
--- src/gnu/usr.bin/gcc4/include/Makefile
+++ src/gnu/usr.bin/gcc4/include/Makefile
@@ -12,10 +12,10 @@
cp $> ${.TARGET}
CLEANFILES+= mm_malloc.h
.endif
-INCSDIR= /usr/include
+INCSDIR= /usr/include/gcc-4.1
.include <bsd.prog.mk>
.PATH: ${G_out_file:H}
Home |
Main Index |
Thread Index |
Old Index