summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-05-12 12:01:12 +0000
committerobrien <obrien@FreeBSD.org>2002-05-12 12:01:12 +0000
commit29ad76a5ac4899481eb7ef288da470b5babbbcad (patch)
treec1fa79f62cc88a90b92c700567933699daf78670 /gnu/usr.bin
parentfc4ab6580e03b50e15ef9d11b605732193158c69 (diff)
downloadFreeBSD-src-29ad76a5ac4899481eb7ef288da470b5babbbcad.zip
FreeBSD-src-29ad76a5ac4899481eb7ef288da470b5babbbcad.tar.gz
Fixes for building a.out bits.
Submitted by: bde
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/cc/cc_tools/auto-host.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 5123028..338b5d3 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -530,7 +530,14 @@
/* #undef USE_AS_TRADITIONAL_FORMAT */
/* Define if your assembler supports marking sections with SHF_MERGE flag. */
-#define HAVE_GAS_SHF_MERGE 1 /* XXX:DEO new, caused Peter IA-64 trouble until he adjusted sys/boot/efi/libefi/arch/ia64/ldscript.ia64 */
+/* XXX:DEO new; caused Peter IA-64 trouble until he adjusted
+ sys/boot/efi/libefi/arch/ia64/ldscript.ia64. */
+#define HAVE_GAS_SHF_MERGE 1
+
+/* XXX HAVE_GAS_SHF_MERGE is target-dependent so it shouldn't be put in
+ this target-independent config file. Defining it breaks aout support
+ on i386's. */
+#undef HAVE_GAS_SHF_MERGE
/* Define if your assembler supports explicit relocations. */
/* #undef HAVE_AS_EXPLICIT_RELOCS */
OpenPOWER on IntegriCloud