Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b304441c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-build-for-linus' of... 

Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, vdso: Don't quote $nm in the script for checking vdso references
  x86, vdso: Error out if the vdso contains external references
parents f7ddc2b6 18642a57

arch/x86/vdso/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE 
quiet_cmd_vdso = VDSO    $@

      cmd_vdso = $(CC) -nostdlib -o $@ \

		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \

		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)

		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \

		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'



VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

GCOV_PROFILE := n

arch/x86/vdso/checkundef.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/bin/sh

nm="$1"

file="$2"

$nm "$file" | grep '^ *U' > /dev/null 2>&1

if [ $? -eq 1 ]; then

    exit 0

else

    echo "$file: undefined symbols found" >&2

    exit 1

fi