From owner-freebsd-hackers@FreeBSD.ORG Sat Jul 2 15:22:15 2011 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB476106566C; Sat, 2 Jul 2011 15:22:15 +0000 (UTC) (envelope-from rmh.aybabtu@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id BEE618FC19; Sat, 2 Jul 2011 15:22:15 +0000 (UTC) Received: by pvg11 with SMTP id 11so4762643pvg.13 for ; Sat, 02 Jul 2011 08:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=pwbe7dtW+fTpIZSFYLKTb0k4jJ8ja0vJTql17C810GQ=; b=uF/WKo/YhtIZsgxJeiW2iYuTCeYHSeZLXeRzhL8UUIpKDJJblAoooPgfqBjvT4GIZ/ fxJpnmbaJMFa6QPsRtJHKRVPTYSn0sVLkebPqJGXKsZrm+7fTsrLpi23m5xYWNQ0zuxx TYIxRd5ccaVJv9Sorm/dVnGXIwIzo/j8DF/HA= MIME-Version: 1.0 Received: by 10.68.27.41 with SMTP id q9mr4620736pbg.337.1309620135375; Sat, 02 Jul 2011 08:22:15 -0700 (PDT) Sender: rmh.aybabtu@gmail.com Received: by 10.68.47.138 with HTTP; Sat, 2 Jul 2011 08:22:15 -0700 (PDT) Date: Sat, 2 Jul 2011 17:22:15 +0200 X-Google-Sender-Auth: 7SPmETFvKjl0iQYjbkGBVBG8PgM Message-ID: From: Robert Millan To: freebsd-hackers@freebsd.org, Ed Maste Content-Type: multipart/mixed; boundary=bcaec520f191f5b3db04a717b22c Cc: Subject: [PATCH] bogus use of __linux__ in aicasm X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jul 2011 15:22:16 -0000 --bcaec520f191f5b3db04a717b22c Content-Type: text/plain; charset=UTF-8 Code in sys/dev/aic7xxx/aicasm/ contains a few checks on the __linux__ macro that actually break build on GNU systems (including Linux-based ones but also GNU/kFreeBSD). Some of them use __linux__ to include an alternate version of that would be placed in "../queue.h". However that file isn't present, which causes build failure. However, this isn't needed anyway, because non-BSD systems can use libbsd [1] to override the GNU version of with a suitable one (Debian uses this method extensively). Hence I propose simply including . In aicasm_symbol.c the __linux__ case again tries to include a non-existant file. As solution I propose assuming that non-BSD systems have installed the 1.85 version of Sleepycat library, which attempts to provide the same API as the BSD native libdb. aicasm.c wants to include only on Linux-based systems, but actually any system with Glibc would provide this file. Proposing fix to use __GLIBC__ instead. Thanks [1] http://libbsd.freedesktop.org/wiki/ -- Robert Millan --bcaec520f191f5b3db04a717b22c Content-Type: text/plain; charset=US-ASCII; name="aicasm_linux.diff" Content-Disposition: attachment; filename="aicasm_linux.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gpmpzdq70 SW5kZXg6IHN5cy9kZXYvYWljN3h4eC9haWNhc20vYWljYXNtLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lz L2Rldi9haWM3eHh4L2FpY2FzbS9haWNhc20uaAkocmV2aXNpb24gMjIzNzIxKQorKysgc3lzL2Rl di9haWM3eHh4L2FpY2FzbS9haWNhc20uaAkod29ya2luZyBjb3B5KQpAQCAtNDIsMTEgKzQyLDcg QEAKICAqICRGcmVlQlNEJAogICovCiAKLSNpZmRlZiBfX2xpbnV4X18KLSNpbmNsdWRlICIuLi9x dWV1ZS5oIgotI2Vsc2UKICNpbmNsdWRlIDxzeXMvcXVldWUuaD4KLSNlbmRpZgogCiAjaWZuZGVm IFRSVUUKICNkZWZpbmUgVFJVRSAxCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2Fz bV9zeW1ib2wuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbV9z eW1ib2wuYwkocmV2aXNpb24gMjIzNzIxKQorKysgc3lzL2Rldi9haWM3eHh4L2FpY2FzbS9haWNh c21fc3ltYm9sLmMJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDEwICs0NCwxMSBAQAogCiAjaW5jbHVk ZSA8c3lzL3R5cGVzLmg+CiAKLSNpZmRlZiBfX2xpbnV4X18KLSNpbmNsdWRlICJhaWNkYi5oIgor I2luY2x1ZGUgPHN5cy9wYXJhbS5oPgkJLyogQlNEICovCisjaWZkZWYgQlNECisjaW5jbHVkZSA8 ZGIuaD4JCQkvKiBCU0QgbmF0aXZlIGxpYmRiICovCiAjZWxzZQotI2luY2x1ZGUgPGRiLmg+Cisj aW5jbHVkZSA8ZGJfMTg1Lmg+CQkvKiBTbGVlcHljYXQgMS44NSBjb21wYXQgKi8KICNlbmRpZgog I2luY2x1ZGUgPGN0eXBlLmg+CiAjaW5jbHVkZSA8ZmNudGwuaD4KSW5kZXg6IHN5cy9kZXYvYWlj N3h4eC9haWNhc20vYWljYXNtX3N5bWJvbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9kZXYvYWljN3h4 eC9haWNhc20vYWljYXNtX3N5bWJvbC5oCShyZXZpc2lvbiAyMjM3MjEpCisrKyBzeXMvZGV2L2Fp Yzd4eHgvYWljYXNtL2FpY2FzbV9zeW1ib2wuaAkod29ya2luZyBjb3B5KQpAQCAtNDIsMTEgKzQy LDcgQEAKICAqICRGcmVlQlNEJAogICovCiAKLSNpZmRlZiBfX2xpbnV4X18KLSNpbmNsdWRlICIu Li9xdWV1ZS5oIgotI2Vsc2UKICNpbmNsdWRlIDxzeXMvcXVldWUuaD4KLSNlbmRpZgogCiB0eXBl ZGVmIGVudW0gewogCVVOSU5JVElBTElaRUQsCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNt L2FpY2FzbV9ncmFtLnkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Rldi9haWM3eHh4L2FpY2FzbS9haWNh c21fZ3JhbS55CShyZXZpc2lvbiAyMjM3MjEpCisrKyBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2Fp Y2FzbV9ncmFtLnkJKHdvcmtpbmcgY29weSkKQEAgLTUxLDEyICs1MSw3IEBACiAjaW5jbHVkZSA8 c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8c3lzZXhpdHMuaD4KLQot I2lmZGVmIF9fbGludXhfXwotI2luY2x1ZGUgIi4uL3F1ZXVlLmgiCi0jZWxzZQogI2luY2x1ZGUg PHN5cy9xdWV1ZS5oPgotI2VuZGlmCiAKICNpbmNsdWRlICJhaWNhc20uaCIKICNpbmNsdWRlICJh aWNhc21fc3ltYm9sLmgiCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbV9tYWNy b19ncmFtLnkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Rldi9haWM3eHh4L2FpY2FzbS9haWNhc21fbWFj cm9fZ3JhbS55CShyZXZpc2lvbiAyMjM3MjEpCisrKyBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2Fp Y2FzbV9tYWNyb19ncmFtLnkJKHdvcmtpbmcgY29weSkKQEAgLTUxLDEyICs1MSw3IEBACiAjaW5j bHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8c3lzZXhpdHMu aD4KLQotI2lmZGVmIF9fbGludXhfXwotI2luY2x1ZGUgIi4uL3F1ZXVlLmgiCi0jZWxzZQogI2lu Y2x1ZGUgPHN5cy9xdWV1ZS5oPgotI2VuZGlmCiAKICNpbmNsdWRlICJhaWNhc20uaCIKICNpbmNs dWRlICJhaWNhc21fc3ltYm9sLmgiCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2Fz bV9zY2FuLmwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Rldi9haWM3eHh4L2FpY2FzbS9haWNhc21fc2Nh bi5sCShyZXZpc2lvbiAyMjM3MjEpCisrKyBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbV9z Y2FuLmwJKHdvcmtpbmcgY29weSkKQEAgLTUxLDExICs1MSw3IEBACiAjaW5jbHVkZSA8c3RkaW8u aD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDxzeXNleGl0cy5oPgotI2lmZGVmIF9f bGludXhfXwotI2luY2x1ZGUgIi4uL3F1ZXVlLmgiCi0jZWxzZQogI2luY2x1ZGUgPHN5cy9xdWV1 ZS5oPgotI2VuZGlmCiAKICNpbmNsdWRlICJhaWNhc20uaCIKICNpbmNsdWRlICJhaWNhc21fc3lt Ym9sLmgiCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbV9tYWNyb19zY2FuLmwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gc3lzL2Rldi9haWM3eHh4L2FpY2FzbS9haWNhc21fbWFjcm9fc2Nhbi5s CShyZXZpc2lvbiAyMjM3MjEpCisrKyBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbV9tYWNy b19zY2FuLmwJKHdvcmtpbmcgY29weSkKQEAgLTUxLDExICs1MSw3IEBACiAjaW5jbHVkZSA8c3Rk aW8uaD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDxzeXNleGl0cy5oPgotI2lmZGVm IF9fbGludXhfXwotI2luY2x1ZGUgIi4uL3F1ZXVlLmgiCi0jZWxzZQogI2luY2x1ZGUgPHN5cy9x dWV1ZS5oPgotI2VuZGlmCiAKICNpbmNsdWRlICJhaWNhc20uaCIKICNpbmNsdWRlICJhaWNhc21f c3ltYm9sLmgiCkluZGV4OiBzeXMvZGV2L2FpYzd4eHgvYWljYXNtL2FpY2FzbS5jCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIHN5cy9kZXYvYWljN3h4eC9haWNhc20vYWljYXNtLmMJKHJldmlzaW9uIDIyMzcyMSkK KysrIHN5cy9kZXYvYWljN3h4eC9haWNhc20vYWljYXNtLmMJKHdvcmtpbmcgY29weSkKQEAgLTUz LDcgKzUzLDcgQEAKICNpbmNsdWRlIDxzeXNleGl0cy5oPgogI2luY2x1ZGUgPHVuaXN0ZC5oPgog Ci0jaWYgbGludXgKKyNpZmRlZiBfX0dMSUJDX18KICNpbmNsdWRlIDxlbmRpYW4uaD4KICNlbHNl CiAjaW5jbHVkZSA8bWFjaGluZS9lbmRpYW4uaD4K --bcaec520f191f5b3db04a717b22c--