switch to per-arch multilib.h since we now use them.

now, given a correctly populated /usr/lib/{i386,sparc} directory, you
can "cc -m32" on amd64/sparc64 and have it be useful.

note that a trivial copy of 32 bit /usr/lib will not work, since you
end up with symlinks to the 64 bit /lib.  work on that part is in
progress...
This commit is contained in:
mrg 2008-10-12 10:08:13 +00:00
parent 55e1b371a4
commit 52f0cd9c9e
17 changed files with 318 additions and 5 deletions

View File

@ -1,5 +1,6 @@
/* $NetBSD: multilib.h,v 1.1 2006/05/10 22:48:12 mrg Exp $ */ /* This file is automatically generated. DO NOT EDIT! */
/* For the moment we don't do multilib. Use a static empty multilib spec file. */ /* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = { static const char *const multilib_raw[] = {
". ;", ". ;",

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,26 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". !m64 !m32;",
".:. m64 !m32;",
".:../lib/sparc !m64 m32;",
NULL
};
static const char *const multilib_matches_raw[] = {
"m64 m64;",
"m32 m32;",
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "m64/m32";
#define DISABLE_MULTILIB 1

View File

@ -0,0 +1,20 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". ;",
NULL
};
static const char *const multilib_matches_raw[] = {
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "";

View File

@ -0,0 +1,26 @@
/* This file is automatically generated. DO NOT EDIT! */
/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
static const char *const multilib_raw[] = {
". !m64 !m32;",
".:. m64 !m32;",
".:../lib/i386 !m64 m32;",
NULL
};
static const char *const multilib_matches_raw[] = {
"m64 m64;",
"m32 m32;",
NULL
};
static const char *multilib_extra = "";
static const char *const multilib_exclusions_raw[] = {
NULL
};
static const char *multilib_options = "m64/m32";
#define DISABLE_MULTILIB 1

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $ # $NetBSD: Makefile,v 1.4 2008/10/12 10:08:13 mrg Exp $
LIBISPRIVATE= yes LIBISPRIVATE= yes
@ -9,14 +9,14 @@ LIB= frontend
SRCS= gcc.c version.c intl.c prefix.c SRCS= gcc.c version.c intl.c prefix.c
CPPFLAGS+= -I${.CURDIR} -I${GCCARCH} -I${BACKENDOBJ} -I. \ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \ ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
-DPREFIX=\"/usr\" \ -DPREFIX=\"/usr\" \
-DDEFAULT_TARGET_VERSION=\"${G_version}\" \ -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
-DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\" -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
DPSRCS+= multilib.h specs.h DPSRCS+= specs.h
MKPIC:= no MKPIC:= no
MKPICLIB:= no MKPICLIB:= no