Skip to content

check_pie: match nsd support #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 9, 2025
Merged

check_pie: match nsd support #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d413a5
add CHECK_PIE support
jaredmauch Jul 7, 2025
08022be
update dependencies
jaredmauch Jul 7, 2025
e575581
Merge branch 'NLnetLabs:main' into main
jaredmauch Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@ maintainer-clean: realclean
devclean: realclean
@rm -rf config.h.in configure

libzone.a: $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
libzone.a: $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS) Makefile
$(AR) rcs libzone.a $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)

$(EXPORT_HEADER):
@mkdir -p include/zone
@echo "#define ZONE_EXPORT" > $(EXPORT_HEADER)

$(WESTMERE_OBJECTS): $(EXPORT_HEADER) .depend
$(WESTMERE_OBJECTS): $(EXPORT_HEADER) .depend Makefile
@mkdir -p src/westmere
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=westmere -o $@ -c $(SOURCE)/$(@:.o=.c)

$(HASWELL_OBJECTS): $(EXPORT_HEADER) .depend
$(HASWELL_OBJECTS): $(EXPORT_HEADER) .depend Makefile
@mkdir -p src/haswell
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=haswell -o $@ -c $(SOURCE)/$(@:.o=.c)

$(OBJECTS): $(EXPORT_HEADER) .depend
$(OBJECTS): $(EXPORT_HEADER) .depend Makefile
@mkdir -p src/fallback
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $(SOURCE)/$(@:.o=.c)
@touch $@
Expand Down
4 changes: 4 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ AC_CONFIG_FILES([Makefile])
m4_include(m4/ax_check_compile_flag.m4)
m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_STDC])

# Include PIE support from parent
m4_include(../acx_nlnetlabs.m4)
ACX_CHECK_PIE

AC_CHECK_HEADERS([endian.h sys/endian.h],,, [AC_INCLUDES_DEFAULT])
AC_CHECK_DECLS([bswap16,bswap32,bswap64], [], [], [
AC_INCLUDES_DEFAULT
Expand Down
Loading