Page MenuHomeFreeBSD
Differential D10859

Fix build with LOCALBASE is not /usr/local.
ClosedPublic
Actions

Authored by bdrewery on May 22 2017, 5:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 5:59 PM
Unknown Object (File)
Tue, Apr 8, 2:16 AM
Unknown Object (File)
Feb 25 2025, 4:49 PM
Unknown Object (File)
Feb 25 2025, 3:56 PM
Unknown Object (File)
Feb 25 2025, 3:19 AM
Unknown Object (File)
Feb 23 2025, 9:38 AM
Unknown Object (File)
Jan 17 2025, 9:00 PM
Unknown Object (File)
Dec 21 2024, 3:47 PM
View All 67 Files
Subscribers
mat

Details

Reviewers
brooks
Commits
rP441483: Fix build when LOCALBASE is not /usr/local.
Test Plan

Built llvm40 with a different PREFIX + LOCALBASE. It failed
before since it was using -I/usr/local/include and -L/usr/local/lib
rather than my supplied LOCALBASE (where existing headers/libs are).

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 9444
Build 9897: arc lint + arc unit

Event Timeline

bdrewery created this revision.May 22 2017, 5:26 PM
Herald added a subscriber: mat. · View Herald TranscriptMay 22 2017, 5:26 PM
Harbormaster completed remote builds in B9444: Diff 28683.May 22 2017, 5:26 PM
brooks accepted this revision.May 22 2017, 5:34 PM

Do we need a version bump or are people with non-default PREFIX values on their own?

This revision is now accepted and ready to land.May 22 2017, 5:34 PM
bdrewery added a comment.May 22 2017, 5:37 PM
In D10859#225031, @brooks wrote:

Do we need a version bump or are people with non-default PREFIX values on their own?

Since it is a build fix, no revision bump is needed. It would not build otherwise. It's also a rare thing for people to do this, but still proper to support it.

Closed by commit rP441483: Fix build when LOCALBASE is not /usr/local. (authored by bdrewery). · Explain WhyMay 22 2017, 5:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
devel/
llvm-cheri/
2 lines
llvm-devel/
2 lines
llvm33/
2 lines
llvm34/
2 lines
llvm35/
2 lines
llvm38/
2 lines
llvm39/
2 lines
llvm40/
2 lines

Diff 28683

View Options

devel/llvm-cheri/Makefile

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
*
* This software was developed by SRI International and the University of
* Cambridge Computer Laboratory (Department of Computer Science and
* Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
* DARPA SSITH research programme.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/types.h>
#include <machine/elf.h>
#include <err.h>
#include <errno.h>
#include "ef.h"
/*
* Apply relocations to the values we got from the file. `relbase' is the
* target relocation address of the section, and `dataoff' is the target
* relocation address of the data in `dest'.
*/
int
ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
Elf_Off dataoff, size_t len, void *dest)
{
Elf_Addr *where, val;
const Elf_Rel *rel;
const Elf_Rela *rela;
Elf_Addr addend, addr;
Elf_Size rtype, symidx;
switch (reltype) {
case EF_RELOC_REL:
rel = (const Elf_Rel *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rel->r_offset -
dataoff);
addend = 0;
rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info);
break;
case EF_RELOC_RELA:
rela = (const Elf_Rela *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rela->r_offset -
dataoff);
addend = rela->r_addend;
rtype = ELF_R_TYPE(rela->r_info);
symidx = ELF_R_SYM(rela->r_info);
break;
default:
return (EINVAL);
}
impUnsubmitted
Not Done
Inline Actions

Do you need a cast here to where to only write 4 bytes instead of 8?

imp: Do you need a cast here to where to only write 4 bytes instead of 8?
jhbAuthorUnsubmitted
Done
Inline Actions

Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations in mips64 kernel modules though. Maybe I'll spin up a 32-bit mips qemu instance to see what happens there. It may be that I end up just using an #ifdef on the ABI for R_MIPS_32 vs R_MIPS_64 and the body of the case is the one for R_MIPS_64.

jhb: Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations…
if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
return (0);
if (reltype == EF_RELOC_REL)
addend = *where;
switch (rtype) {
#ifdef __LP64__
case R_MIPS_64: /* S + A */
#else
case R_MIPS_32: /* S + A */
#endif
addr = EF_SYMADDR(ef, symidx);
val = addr + addend;
*where = val;
break;
default:
warnx("unhandled relocation type %d", (int)rtype);
}
return (0);
}
View Options

devel/llvm-devel/Makefile

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
*
* This software was developed by SRI International and the University of
* Cambridge Computer Laboratory (Department of Computer Science and
* Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
* DARPA SSITH research programme.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/types.h>
#include <machine/elf.h>
#include <err.h>
#include <errno.h>
#include "ef.h"
/*
* Apply relocations to the values we got from the file. `relbase' is the
* target relocation address of the section, and `dataoff' is the target
* relocation address of the data in `dest'.
*/
int
ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
Elf_Off dataoff, size_t len, void *dest)
{
Elf_Addr *where, val;
const Elf_Rel *rel;
const Elf_Rela *rela;
Elf_Addr addend, addr;
Elf_Size rtype, symidx;
switch (reltype) {
case EF_RELOC_REL:
rel = (const Elf_Rel *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rel->r_offset -
dataoff);
addend = 0;
rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info);
break;
case EF_RELOC_RELA:
rela = (const Elf_Rela *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rela->r_offset -
dataoff);
addend = rela->r_addend;
rtype = ELF_R_TYPE(rela->r_info);
symidx = ELF_R_SYM(rela->r_info);
break;
default:
return (EINVAL);
}
impUnsubmitted
Not Done
Inline Actions

Do you need a cast here to where to only write 4 bytes instead of 8?

imp: Do you need a cast here to where to only write 4 bytes instead of 8?
jhbAuthorUnsubmitted
Done
Inline Actions

Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations in mips64 kernel modules though. Maybe I'll spin up a 32-bit mips qemu instance to see what happens there. It may be that I end up just using an #ifdef on the ABI for R_MIPS_32 vs R_MIPS_64 and the body of the case is the one for R_MIPS_64.

jhb: Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations…
if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
return (0);
if (reltype == EF_RELOC_REL)
addend = *where;
switch (rtype) {
#ifdef __LP64__
case R_MIPS_64: /* S + A */
#else
case R_MIPS_32: /* S + A */
#endif
addr = EF_SYMADDR(ef, symidx);
val = addr + addend;
*where = val;
break;
default:
warnx("unhandled relocation type %d", (int)rtype);
}
return (0);
}
View Options

devel/llvm33/Makefile

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
*
* This software was developed by SRI International and the University of
* Cambridge Computer Laboratory (Department of Computer Science and
* Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
* DARPA SSITH research programme.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/types.h>
#include <machine/elf.h>
#include <err.h>
#include <errno.h>
#include "ef.h"
/*
* Apply relocations to the values we got from the file. `relbase' is the
* target relocation address of the section, and `dataoff' is the target
* relocation address of the data in `dest'.
*/
int
ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
Elf_Off dataoff, size_t len, void *dest)
{
Elf_Addr *where, val;
const Elf_Rel *rel;
const Elf_Rela *rela;
Elf_Addr addend, addr;
Elf_Size rtype, symidx;
switch (reltype) {
case EF_RELOC_REL:
rel = (const Elf_Rel *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rel->r_offset -
dataoff);
addend = 0;
rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info);
break;
case EF_RELOC_RELA:
rela = (const Elf_Rela *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rela->r_offset -
dataoff);
addend = rela->r_addend;
rtype = ELF_R_TYPE(rela->r_info);
symidx = ELF_R_SYM(rela->r_info);
break;
default:
return (EINVAL);
}
impUnsubmitted
Not Done
Inline Actions

Do you need a cast here to where to only write 4 bytes instead of 8?

imp: Do you need a cast here to where to only write 4 bytes instead of 8?
jhbAuthorUnsubmitted
Done
Inline Actions

Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations in mips64 kernel modules though. Maybe I'll spin up a 32-bit mips qemu instance to see what happens there. It may be that I end up just using an #ifdef on the ABI for R_MIPS_32 vs R_MIPS_64 and the body of the case is the one for R_MIPS_64.

jhb: Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations…
if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
return (0);
if (reltype == EF_RELOC_REL)
addend = *where;
switch (rtype) {
#ifdef __LP64__
case R_MIPS_64: /* S + A */
#else
case R_MIPS_32: /* S + A */
#endif
addr = EF_SYMADDR(ef, symidx);
val = addr + addend;
*where = val;
break;
default:
warnx("unhandled relocation type %d", (int)rtype);
}
return (0);
}
View Options

devel/llvm34/Makefile

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
*
* This software was developed by SRI International and the University of
* Cambridge Computer Laboratory (Department of Computer Science and
* Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
* DARPA SSITH research programme.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#include <sys/types.h>
#include <machine/elf.h>
#include <err.h>
#include <errno.h>
#include "ef.h"
/*
* Apply relocations to the values we got from the file. `relbase' is the
* target relocation address of the section, and `dataoff' is the target
* relocation address of the data in `dest'.
*/
int
ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
Elf_Off dataoff, size_t len, void *dest)
{
Elf_Addr *where, val;
const Elf_Rel *rel;
const Elf_Rela *rela;
Elf_Addr addend, addr;
Elf_Size rtype, symidx;
switch (reltype) {
case EF_RELOC_REL:
rel = (const Elf_Rel *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rel->r_offset -
dataoff);
addend = 0;
rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info);
break;
case EF_RELOC_RELA:
rela = (const Elf_Rela *)reldata;
where = (Elf_Addr *)((char *)dest + relbase + rela->r_offset -
dataoff);
addend = rela->r_addend;
rtype = ELF_R_TYPE(rela->r_info);
symidx = ELF_R_SYM(rela->r_info);
break;
default:
return (EINVAL);
}
impUnsubmitted
Not Done
Inline Actions

Do you need a cast here to where to only write 4 bytes instead of 8?

imp: Do you need a cast here to where to only write 4 bytes instead of 8?
jhbAuthorUnsubmitted
Done
Inline Actions

Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations in mips64 kernel modules though. Maybe I'll spin up a 32-bit mips qemu instance to see what happens there. It may be that I end up just using an #ifdef on the ABI for R_MIPS_32 vs R_MIPS_64 and the body of the case is the one for R_MIPS_64.

jhb: Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations…
if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
return (0);
if (reltype == EF_RELOC_REL)
addend = *where;
switch (rtype) {
#ifdef __LP64__
case R_MIPS_64: /* S + A */
#else
case R_MIPS_32: /* S + A */
#endif
addr = EF_SYMADDR(ef, symidx);
val = addr + addend;
*where = val;
break;
default:
warnx("unhandled relocation type %d", (int)rtype);
}
return (0);
}
View Options

devel/llvm35/Makefile

Loading...
View Options

devel/llvm38/Makefile

Loading...
View Options

devel/llvm39/Makefile

Loading...
View Options

devel/llvm40/Makefile

Loading...