sync
This commit is contained in:
parent
0f55503fed
commit
ab90ba3a7c
GPG key ID:
F42C07F07E2E35B7
92 changed files with 264 additions and 259 deletions
|
|
@ -36,7 +36,7 @@ MAKE_FLAGS+= _REGRESS_TMP=${_REGRESS_TMP}
|
|||
${_REGRESS_CLEAN}
|
||||
|
||||
.END: .SILENT
|
||||
.if ${.TARGETS:Mall} || ${.TARGETS:Mregress}
|
||||
.if ${.TARGETS:Mall} || ${.TARGETS:Mregress}
|
||||
echo ====================================================================
|
||||
.if empty(REGRESS_MAIL) || empty(_REGRESS_TMP)
|
||||
echo You can set REGRESS_LOG to point to a file and mail it manually.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ function test_expr {
|
|||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# The first arg will get eval'd so escape any meta characters
|
||||
# The 2nd arg is an expected string/response from expr for that op.
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ test_expr '1 - -5' '6'
|
|||
# More complex math test for precedence
|
||||
test_expr '-3 + -1 \* 4 + 3 / -6' '-7'
|
||||
|
||||
# The next two are messy but the shell escapes cause that.
|
||||
# The next two are messy but the shell escapes cause that.
|
||||
# Test precendence
|
||||
test_expr 'X1/2/3 : X\\\(.\*[^/]\\\)//\*[^/][^/]\*/\*$ \| . : \\\(.\\\)' '1/2'
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ REGRESS_TARGETS= ${C_TARGETS} ${CPP_TARGETS}
|
|||
|
||||
.for i in ${C_MODULES}
|
||||
. for j in ${C_${i:U}}
|
||||
C_TARGETS+= c-${i}-${j}
|
||||
C_TARGETS+= c-${i}-${j}
|
||||
c-${i}-${j}:
|
||||
${TCC} ${TCFLAGS} -o /dev/null ${i}-${j}.c 2>&1 | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' | diff -u - ${.CURDIR}/${i}-${j}.c${EXP}
|
||||
. endfor
|
||||
|
|
@ -59,9 +59,9 @@ NOOBJ= Yes
|
|||
REGRESS_EXPECTED_FAILURES= c-getcwd-1
|
||||
.endif
|
||||
|
||||
.if ${BUILD_GCC3:L} == "yes"
|
||||
.if ${BUILD_GCC3:L} == "yes"
|
||||
EXP= .exp.gcc3
|
||||
.elif ${BUILD_GCC4:L} == "yes"
|
||||
.elif ${BUILD_GCC4:L} == "yes"
|
||||
EXP= .exp.gcc4
|
||||
.else
|
||||
regress:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# $OpenBSD: Makefile,v 1.19 2022/08/20 14:13:48 sthen Exp $
|
||||
|
||||
SUBDIR+= elf hidden weak dlsym dlopen dlclose lazy
|
||||
SUBDIR+= constructor
|
||||
SUBDIR+= constructor
|
||||
SUBDIR+= link-order edgecases initfirst
|
||||
SUBDIR+= df_1_noopen randomdata subst dependencies
|
||||
SUBDIR+= init-env nodelete noload
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LDADD=
|
|||
LDADD+=-lab
|
||||
LDADD+=-laa
|
||||
LDFLAGS=-L$(AA_OBJDIR) -L$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LDADD=
|
|||
LDADD+=-laa
|
||||
LDADD+=-lab
|
||||
LDFLAGS=-L$(AA_OBJDIR) -L$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ int funaa(void)
|
|||
{
|
||||
return 1 + symbb;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ int funaa(void)
|
|||
{
|
||||
return 1 + symbb;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "aa.h"
|
||||
char strbuf[512];
|
||||
|
||||
extern "C" {
|
||||
extern "C" {
|
||||
const char *libname = "libaa";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LDADD=
|
|||
#LDADD+=-lab
|
||||
#LDADD+=-laa
|
||||
#LDFLAGS=-L$(AA_OBJDIR) -L$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
LD_LIBRARY_PATH=$(AA_OBJDIR):$(AB_OBJDIR)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LDADD=
|
|||
LDADD+=-laa
|
||||
LDADD+=-lab
|
||||
LDFLAGS=-L$(AA_OBJDIR) -L$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AB_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LDADD=
|
|||
#LDADD+=-lac
|
||||
LDFLAGS=-L$(AA_OBJDIR) -L$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-disable-new-dtags
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AC_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ LDADD=
|
|||
#LDADD+=-laa
|
||||
#LDADD+=-lac
|
||||
LDFLAGS=-L$(AA_OBJDIR) -L$(AC_OBJDIR)
|
||||
#LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AC_OBJDIR)
|
||||
#LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(AC_OBJDIR)
|
||||
# This intentionally leaves out AA_OBJDIR from -rpath
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
SUBDIR=libaa_g libaa_b prog1
|
||||
SUBDIR=libaa_g libaa_b prog1
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
/*
|
||||
* Public domain - Matthieu Herrb 2002
|
||||
*
|
||||
*
|
||||
* $OpenBSD: elfbug.h,v 1.1 2002/02/05 21:47:23 matthieu Exp $
|
||||
*/
|
||||
extern int (*func)(void);
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ AE_OBJDIR!= if [ -d $(AE_DIR)/${__objdir} ]; then \
|
|||
LDADD=-laa
|
||||
LDFLAGS= -L$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,--disable-new-dtags
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AD_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AE_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AD_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AE_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ AE_OBJDIR!= if [ -d $(AE_DIR)/${__objdir} ]; then \
|
|||
LDADD=-laa
|
||||
LDFLAGS= -L$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,--disable-new-dtags
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AD_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AE_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AB_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AD_OBJDIR)
|
||||
LDFLAGS+= -Wl,-rpath,$(AE_OBJDIR)
|
||||
NOMAN=
|
||||
CC=c++
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ foo(void)
|
|||
{
|
||||
if (h == NULL)
|
||||
foo_init();
|
||||
|
||||
|
||||
return bar();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ int
|
|||
checksym(const char *name)
|
||||
{
|
||||
void *sym = dlsym(RTLD_DEFAULT, name);
|
||||
|
||||
|
||||
if (sym != NULL) {
|
||||
printf("symbol present: %s\n", name);
|
||||
return 1;
|
||||
|
|
@ -35,7 +35,7 @@ main(int argc, char *argv[])
|
|||
/* symbol should not be here at startup */
|
||||
if (checksym(SYMBOL) == 1)
|
||||
errx(1, "symbol found: %s", SYMBOL);
|
||||
|
||||
|
||||
printf("opening\n");
|
||||
if ((h1 = dlopen(LIBNAME, RTLD_GLOBAL)) == NULL)
|
||||
errx(1, "dlopen: h1: %s: %s", LIBNAME, dlerror());
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=1
|
||||
minor=0
|
||||
minor=0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue