From 1f5f7fd77471a853855cc5808f6022fc52b3533e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 26 Oct 2017 21:45:33 +0200 Subject: [PATCH] havelib: Fix value of LD for 32-bit compilation on NetBSD/sparc64. * m4/lib-ld.m4 (AC_LIB_PROG_LD): On NetBSD/sparc64 with CC="gcc -m32", set LD to '/usr/bin/ld -m elf32_sparc', not '/usr/bin/ld'. --- ChangeLog | 6 ++++++ m4/lib-ld.m4 | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 23b8c0e8e2..7ce63c22f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-10-26 Bruno Haible + + havelib: Fix value of LD for 32-bit compilation on NetBSD/sparc64. + * m4/lib-ld.m4 (AC_LIB_PROG_LD): On NetBSD/sparc64 with CC="gcc -m32", + set LD to '/usr/bin/ld -m elf32_sparc', not '/usr/bin/ld'. + 2017-10-21 Paul Eggert glob: fix another heap buffer overflow diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 8b8a26e8d5..cffa0ef913 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 7 +# lib-ld.m4 serial 8 dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -133,6 +133,20 @@ else esac ], []) ;; + sparc64-*-netbsd*) + AC_EGREP_CPP([yes], + [#if defined __sparcv9 || defined __arch64__ + yes + #endif], + [], + [# The compiler produces 32-bit code. Add option '-m elf32_sparc' + # so that the linker groks 32-bit object files. + case "$acl_cv_path_LD " in + *" -m elf32_sparc "*) ;; + *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; + esac + ]) + ;; esac ]) LD="$acl_cv_path_LD" -- 2.39.5